From: Jani Nikula <jani.nikula@intel.com>
Date: Fri, 28 Feb 2025 09:25:36 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: v6.15-rc1~120^2~9^2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8918e180a6fd67fc9864f2ba18186b4573f8a61b;p=thirdparty%2Fkernel%2Fstable.git

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>
---

8918e180a6fd67fc9864f2ba18186b4573f8a61b