Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds...

Linux 5.18-rc5

There was a build fix for arm I wanted in drm-next, so backmerge rather then cherry-pick.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/amdgpu_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_fbc.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_psr.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_sync.c
index 49bbb22,f63efd8..6416f12
--- 1/drivers/gpu/drm/radeon/radeon_sync.c
--- 2/drivers/gpu/drm/radeon/radeon_sync.c
+++ b/drivers/gpu/drm/radeon/radeon_sync.c
@@@ -96,7 -96,7 +96,7 @@@ int radeon_sync_resv(struct radeon_devi
        struct dma_fence *f;
        int r = 0;
  
-       dma_resv_for_each_fence(&cursor, resv, dma_resv_usage_rw(shared), f) {
 -      dma_resv_for_each_fence(&cursor, resv, !shared, f) {
++      dma_resv_for_each_fence(&cursor, resv, dma_resv_usage_rw(!shared), f) {
                fence = to_radeon_fence(f);
                if (fence && fence->rdev == rdev)
                        radeon_sync_fence(sync, fence);

diff --cc drivers/gpu/drm/vc4/Kconfig
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge