]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Wed, 11 Sep 2024 07:57:18 +0000 (10:57 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 11 Sep 2024 07:57:18 +0000 (10:57 +0300)
commit02189ca8411253aa1328e9dd6137a40e390a5b37
tree94aa1a3f7aa6e863a790092dfe9d3b53c27565c3
parent54df34c5a2439b481f066476e67bfa21a0a640e5
parentb615b9c36cae0468491547206406a909a9a37f26
Merge drm/drm-next into drm-intel-next

Sync the branches to resolve the conflict reported in the below link.

Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/xe/display/xe_display.c