Merge tag 'v6.17-rc6' into drm-next

This is a backmerge of Linux 6.17-rc6, needed for msm,
also requested by misc.

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

diff --cc .mailmap
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/display/dc/dc.h
index aa808675feadad7ebe18ea5b3965c14f9505f045,f24e1da68269e49cf01d42a0e8a238e2050839f9..954a2786fbe295a02073e6991b24939ce2691d8d
--- 1/drivers/gpu/drm/amd/display/dc/dc.h
--- 2/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@@ -1157,12 -1145,7 +1157,12 @@@ struct dc_debug_options 
        bool enable_hblank_borrow;
        bool force_subvp_df_throttle;
        uint32_t acpi_transition_bitmasks[MAX_PIPES];
-       bool enable_pg_cntl_debug_logs;
+       bool enable_pg_cntl_debug_logs;
 +      unsigned int auxless_alpm_lfps_setup_ns;
 +      unsigned int auxless_alpm_lfps_period_ns;
 +      unsigned int auxless_alpm_lfps_silence_ns;
 +      unsigned int auxless_alpm_lfps_t1t2_us;
 +      short auxless_alpm_lfps_t1t2_offset_us;
  };
  
  

diff --cc drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
Simple merge

diff --cc drivers/gpu/drm/drm_gpuvm.c
index 78a1a4f095095e9379bdf604d583f6c8b9863ccb,db9b089ef62c85a9ac1490a964716073a4e1da0d..a52e95555549a16c062168253477035679d4775b
--- 1/drivers/gpu/drm/drm_gpuvm.c
--- 2/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@@ -2741,10 -2613,13 +2743,10 @@@ err_free_ops
  /**
   * drm_gpuvm_sm_map_ops_create() - creates the &drm_gpuva_ops to split and merge
   * @gpuvm: the &drm_gpuvm representing the GPU VA space
 - * @req_addr: the start address of the new mapping
 - * @req_range: the range of the new mapping
 - * @req_obj: the &drm_gem_object to map
 - * @req_offset: the offset within the &drm_gem_object
 + * @req: map request arguments
   *
   * This function creates a list of operations to perform splitting and merging
-  * of existent mapping(s) with the newly requested one.
+  * of existing mapping(s) with the newly requested one.
   *
   * The list can be iterated with &drm_gpuva_for_each_op and must be processed
   * in the given order. It can contain map, unmap and remap operations, but it

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_uvmm.c
Simple merge

diff --cc drivers/gpu/drm/nova/file.rs
index 7e7d4e2de2fb249b367465133fef9bc5ceb6023a,4fe62cf98a23e9f0b6cfdaf4f1f3af34c444ca69..90b9d2d0ec4ae0ddaf1c8bdfbcac72537f475601
--- 1/drivers/gpu/drm/nova/file.rs
--- 2/drivers/gpu/drm/nova/file.rs
+++ b/drivers/gpu/drm/nova/file.rs
@@@ -36,7 -39,8 +36,7 @@@ impl File 
              _ => return Err(EINVAL),
          };
  
-         getparam.value = value;
 -        #[allow(clippy::useless_conversion)]
 -        getparam.set_value(value.into());
++        getparam.value = Into::<u64>::into(value);
  
          Ok(0)
      }

diff --cc drivers/gpu/drm/panthor/panthor_drv.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/xe/xe_device_types.h
Simple merge

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

diff --cc drivers/gpu/drm/xe/xe_pm.c
index d4b54cd34cff0f67849993645c8f79d73f94de67,bb9b6ecad2afcda7f1b9e8c3d12afb1121d04142..6eea4190bbd2ca615f085711e90b3d3b28c44d7d
--- 1/drivers/gpu/drm/xe/xe_pm.c
--- 2/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@@ -23,8 -23,8 +23,9 @@@
  #include "xe_irq.h"
  #include "xe_pcode.h"
  #include "xe_pxp.h"
 +#include "xe_sriov_vf_ccs.h"
  #include "xe_trace.h"
+ #include "xe_vm.h"
  #include "xe_wa.h"
  
  /**

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

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

diff --cc drivers/gpu/drm/xe/xe_vm.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_vm_types.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_wa_oob.rules
Simple merge

diff --cc include/drm/drm_gpuvm.h
Simple merge

diff --cc rust/kernel/drm/device.rs
index 4a62f9fd88b75e46aaa44a2f121af2d4761b0fa7,d29c477e89a87de48e426d543ff3e7996324a722..bb8e43c77dc975792361bc2e9518ee689c260ff8
--- 1/rust/kernel/drm/device.rs
--- 2/rust/kernel/drm/device.rs
+++ b/rust/kernel/drm/device.rs
@@@ -10,10 -11,9 +11,10 @@@ use crate::
      error::from_err_ptr,
      error::Result,
      prelude::*,
 -    types::{ARef, AlwaysRefCounted, Opaque},
 +    sync::aref::{ARef, AlwaysRefCounted},
 +    types::Opaque,
  };
- use core::{mem, ops::Deref, ptr, ptr::NonNull};
+ use core::{alloc::Layout, mem, ops::Deref, ptr, ptr::NonNull};
  
  #[cfg(CONFIG_DRM_LEGACY)]
  macro_rules! drm_legacy_fields {