]> www.infradead.org Git - users/willy/xarray.git/commit
Merge drm/drm-next into drm-xe-next
authorLucas De Marchi <lucas.demarchi@intel.com>
Fri, 28 Feb 2025 14:54:14 +0000 (06:54 -0800)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 28 Feb 2025 14:54:14 +0000 (06:54 -0800)
commit0410c6121529409b08e81a77ae3ee58c657e2243
treebc9da8b17b25dba10227dd658fce2dbf8adaad7c
parentba757a65d2a28d46a8ccf50538f4f05036983f1b
parent33e26f3544a558e7476eb221ff33173759b3a116
Merge drm/drm-next into drm-xe-next

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

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/base/devres.c
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/display/xe_display.c
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_device_types.h
drivers/gpu/drm/xe/xe_observation.c