git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6709388 33e26f3)

author	Jani Nikula <jani.nikula@intel.com>
	Fri, 28 Feb 2025 09:25:36 +0000 (11:25 +0200)
committer	Jani Nikula <jani.nikula@intel.com>
	Fri, 28 Feb 2025 09:25:36 +0000 (11:25 +0200)
commit	8918e180a6fd67fc9864f2ba18186b4573f8a61b
tree	76a85b3cf4c35818c3b622b65da7ae3dae5ff6ac	tree
parent	67093883808b5b39894d8859937be4468eca50db	commit \| diff
parent	33e26f3544a558e7476eb221ff33173759b3a116	commit \| diff

Merge drm/drm-next into drm-intel-next

Sync to fix conlicts between drm-xe-next and drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

drivers/gpu/drm/i915/display/icl_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_crt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/vlv_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_driver.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)