From: Daniel Vetter Date: Tue, 23 Jun 2015 06:31:49 +0000 (+0200) Subject: Merge remote-tracking branch 'airlied/drm-next' into HEAD X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b076ecdf343b029c4c2c3a94ffd0199d97aa46c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'airlied/drm-next' into HEAD Backmerge drm-next because the conflict between Ander's atomic fixes for 4.2 and Maartens future work are getting to unwielding to handle. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_ringbuffer.h Just always take ours, same as git merge -X ours, but done by hand because I didn't trust git: It's confusing that it doesn't show any conflicts in the merge diff at all. Signed-off-by: Daniel Vetter --- 0b076ecdf343b029c4c2c3a94ffd0199d97aa46c