Merge tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux...

thunderbolt: Fixes for v6.12-rc7

This includes following USB4/Thunderbolt fixes for v6.12-rc7:

  - Fix for retimer enumeration.
  - Fix connection issue with Pluggable UD-4VPD USB4 dock.

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix connection issue with Pluggable UD-4VPD dock
  thunderbolt: Add only on-board retimers when !CONFIG_USB4_DEBUGFS_MARGINING

diff --cc drivers/thunderbolt/retimer.c
index 7db9869a9f3fe7681301c7586b13569597fea9a3,bdf641489f8222f503f04e036ad0a554eda5f85b..89d2919d0193e8f5c68e669d054f3efc7abf78c8
--- 1/drivers/thunderbolt/retimer.c
--- 2/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@@ -527,11 -527,12 +527,13 @@@ int tb_retimer_scan(struct tb_port *por
                        last_idx = i;
                else if (ret < 0)
                        break;
 +
 +              max = i;
        }
  
 -      max = i;
        ret = 0;
+       if (!IS_ENABLED(CONFIG_USB4_DEBUGFS_MARGINING))
+               max = min(last_idx, max);
  
        /* Add retimers if they do not exist already */
        for (i = 1; i <= max; i++) {