From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Tue, 24 Oct 2023 08:50:22 +0000 (+0100)
Subject: Merge drm/drm-next into drm-intel-gt-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0;p=linux.git

Merge drm/drm-next into drm-intel-gt-next

Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:

  3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
  ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---

a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0