Merge drm/drm-next into drm-xe-next

Additional backmerge to avoid excessive diffstats when
sending PR.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

diff --cc drivers/gpu/drm/xe/xe_bo.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_bo.h
index 8bc449c78cc7316631b151042aee1f3f573f9119,b39b465708085a5685217ff2c8cae0513b9e0b92..02ada1fb8a2359b0456c13cdb4a444c6c82e844e
--- 1/drivers/gpu/drm/xe/xe_bo.h
--- 2/drivers/gpu/drm/xe/xe_bo.h
+++ b/drivers/gpu/drm/xe/xe_bo.h
@@@ -274,11 -274,9 +274,11 @@@ uint64_t vram_region_gpu_offset(struct 
  bool xe_bo_can_migrate(struct xe_bo *bo, u32 mem_type);
  
  int xe_bo_migrate(struct xe_bo *bo, u32 mem_type);
- int xe_bo_evict(struct xe_bo *bo, bool force_alloc);
+ int xe_bo_evict(struct xe_bo *bo);
  
  int xe_bo_evict_pinned(struct xe_bo *bo);
 +int xe_bo_notifier_prepare_pinned(struct xe_bo *bo);
 +int xe_bo_notifier_unprepare_pinned(struct xe_bo *bo);
  int xe_bo_restore_pinned(struct xe_bo *bo);
  
  int xe_bo_dma_unmap_pinned(struct xe_bo *bo);