From: Dave Airlie <airlied@redhat.com>
Date: Thu, 1 May 2025 19:42:10 +0000 (+1000)
Subject: Merge tag 'drm-intel-fixes-2025-04-30' of https://gitlab.freedesktop.org/drm/i915... 
X-Git-Tag: v6.15-rc5~14^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cbbec17322395729def1fdbdba9be8b2d0f4de2;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'drm-intel-fixes-2025-04-30' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes

drm/i915 fixes for v6.15-rc5:
- Fix build for CONFIG_DRM_I915_PXP=n

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/87selquhpe.fsf@intel.com
---

1cbbec17322395729def1fdbdba9be8b2d0f4de2