Merge tag 'thunderbolt-for-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

Mika writes:
  "thunderbolt: Changes for v6.1 merge window

   This includes following Thunderbolt/USB4 changes for the v6.1 merge
   window:
     - Support for Intel Meteor Lake integrated Thunderbolt/USB4 controller
     - Support for ASMedia USB4 controller NVM firmware upgrade
     - Receiver lane margining support
     - Few fixes and cleanups.

   All these have been in linux-next with no reported issues."

* tag 'thunderbolt-for-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Explicitly enable lane adapter hotplug events at startup
  thunderbolt: Use dev_err_probe()
  thunderbolt: Convert to use sysfs_emit()/sysfs_emit_at() APIs
  thunderbolt: Fix spelling mistake "simultaneusly" -> "simultaneously"
  thunderbolt: debugfs: Fix spelling mistakes in seq_puts text
  thunderbolt: Add support for ASMedia NVM image format
  thunderbolt: Move vendor specific NVM handling into nvm.c
  thunderbolt: Provide tb_retimer_nvm_read() analogous to tb_switch_nvm_read()
  thunderbolt: Rename and make nvm_read() available for other files
  thunderbolt: Extend NVM version fields to 32-bits
  thunderbolt: Allow NVM upgrade of USB4 host routers
  thunderbolt: Add support for receiver lane margining
  thunderbolt: Add helper to check if CL states are enabled on port
  thunderbolt: Pass CL state bitmask to tb_port_clx_supported()
  thunderbolt: Move port CL state functions into correct place in switch.c
  thunderbolt: Move tb_xdomain_parent() to tb.h
  thunderbolt: Add support for Intel Meteor Lake
  thunderbolt: Add comment where Thunderbolt 4 PCI IDs start
  thunderbolt: Add DP OUT resource when DP tunnel is discovered

diff --cc drivers/thunderbolt/Kconfig
index f12d0a3ee3e253049aad5e2b34a4155be56f80e8,d76ba4faca0df5306f4ca109c2fef039d3d5f4ae..448fd2ec8f6e2e6e263f96722803b69fc36ee9d8
--- 1/drivers/thunderbolt/Kconfig
--- 2/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@@ -27,9 -27,20 +27,19 @@@ config USB4_DEBUGFS_WRIT
          Only enable this if you know what you are doing! Never enable
          this for production systems or distro kernels.
  
+ config USB4_DEBUGFS_MARGINING
+       bool "Expose receiver lane margining operations under USB4 ports (DANGEROUS)"
+       depends on DEBUG_FS
+       depends on USB4_DEBUGFS_WRITE
+       help
+         Enables hardware and software based receiver lane margining support
+         under each USB4 port. Used for electrical quality and robustness
+         validation during manufacturing. Should not be enabled by distro
+         kernels.
+ 
  config USB4_KUNIT_TEST
        bool "KUnit tests" if !KUNIT_ALL_TESTS
 -      depends on (USB4=m || KUNIT=y)
 -      depends on KUNIT
 +      depends on USB4 && KUNIT=y
        default KUNIT_ALL_TESTS
  
  config USB4_DMA_TEST

diff --cc drivers/thunderbolt/icm.c
Simple merge

diff --cc drivers/thunderbolt/nhi.h
Simple merge

diff --cc drivers/thunderbolt/switch.c
Simple merge