]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge drm/drm-next into drm-xe-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 9 Dec 2024 14:56:45 +0000 (09:56 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 9 Dec 2024 14:59:47 +0000 (09:59 -0500)
commitbc893280751ab566892399fe4e81a9a67a4097be
treeb67f2114392d7888adb463a30fe2e368ccb90697
parent26bba754539a274fb4905cb07d244ca291bcc5d0
parentfac04efc5c793dccbd07e2d59af9f90b7fc0dca4
Merge drm/drm-next into drm-xe-next

Catch up with -rc2 and fixing namespace conflict issue caused by
commit cdd30ebb1b9f ("module: Convert symbol namespace to string literal")
and commit 0c45e76fcc62 ("drm/xe/vsec: Support BMG devices")

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/xe_vsec.c