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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 688c43d 8400291)

author	Jani Nikula <jani.nikula@intel.com>
	Thu, 1 Aug 2024 10:06:09 +0000 (13:06 +0300)
committer	Jani Nikula <jani.nikula@intel.com>
	Thu, 1 Aug 2024 10:06:09 +0000 (13:06 +0300)
commit	3663e2c4bc45fcdc71931fcbfcbfbf9b71f55c83
tree	3927fa90c7faa89131fcf2e789ca9de97a65dc5f	tree \| snapshot
parent	688c43dd6ca9e0cd0568868aefca5b041695c3f4	commit \| diff
parent	8400291e289ee6b2bf9779ff1c83a291501f017b	commit \| diff

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

Sync with v6.11-rc1 in general, and specifically get the new
BACKLIGHT_POWER_ constants for power states.

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

drivers/gpu/drm/display/drm_dp_mst_topology.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c	diff1 \|	diff2 \|	blob \| history

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