Merge tag 'v4.3-rc2' into topic/drm-misc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 22 Sep 2015 09:02:18 +0000 (11:02 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 24 Sep 2015 15:18:41 +0000 (17:18 +0200)
commit646db260b843d2f758559a5483174354c304acf8
tree73cf06896311567e8fcb75730d4461fd689a3d3f
parenta645654b817feba05e5156345325d19fc85ebc9f
parent1f93e4a96c9109378204c147b3eec0d0e8100fde
Merge tag 'v4.3-rc2' into topic/drm-misc

Backmerge Linux 4.3-rc2 because of conflicts in the dp helper code
between bugfixes and new code. Just adjacent lines really.

On top of that there's a silent conflict in the new fsl-dcu driver
merged into 4.3 and

commit 844f9111f6f54f88eb2f0fac121b82ce77193866
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Wed Sep 2 10:42:40 2015 +0200

    drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.

which Thierry Reding spotted and provided a fixup for.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Documentation/kernel-parameters.txt
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_dp_helper.c
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
drivers/gpu/drm/i915/intel_audio.c
drivers/gpu/drm/i915/intel_display.c