]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit598662616508ee7ee4e43641b29fafdfb5dcc343
tree73cf06896311567e8fcb75730d4461fd689a3d3f
parentedda8fd30b883e932e60670b0b2ca6fd62c760b8
parentcc325c104bb229cd7ccd17c1f201de2fd8065948
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 4c4a7e32232a3d505b4e2ed181eb38351525f17c
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