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

Thomas needs the dma_resv_for_each_fence API for i915/ttm async migration
work.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index a2b485a1be8c73d15d9114c63d5ca78d55f6dbe7,e8a58c9971703e7d1a49a1ca41f23e94df95894e..f291cf4c38860d5e2f7e2c8193006b7cc1ebe18e
--- 1/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
--- 2/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@@ -12,13 -15,8 +15,15 @@@
  #include "i915_gem_object.h"
  #include "i915_scatterlist.h"
  
+ MODULE_IMPORT_NS(DMA_BUF);
+ 
 +#if defined(CONFIG_X86)
 +#include <asm/smp.h>
 +#else
 +#define wbinvd_on_all_cpus() \
 +      pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
 +#endif
 +
  I915_SELFTEST_DECLARE(static bool force_different_devices;)
  
  static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf)

diff --cc drivers/gpu/drm/i915/gt/intel_context.c
Simple merge

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

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

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

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