git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7eeaedf 11ae5eb)
Merge drm/drm-next into drm-intel-gt-next
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 24 Oct 2023 08:50:22 +0000 (09:50 +0100)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Tue, 24 Oct 2023 08:50:22 +0000 (09:50 +0100)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.