Merge 6.9-rc5 into usb-next

We need the usb/thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/gadget/function/f_fs.c
index d3a7f7bae07b032e5dde35ea15e496abb8c3e62d,f855f1fc8e5e14d253a61382a692a9173c2e2c26..8710e32b4949e8a582da8e86f8c6d5596409f249
--- 1/drivers/usb/gadget/function/f_fs.c
--- 2/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@@ -45,8 -45,9 +45,10 @@@
  #include "configfs.h"
  
  #define FUNCTIONFS_MAGIC      0xa647361 /* Chosen by a honest dice roll ;) */
 +#define MAX_ALT_SETTINGS      2                 /* Allow up to 2 alt settings to be set. */
  
+ #define DMABUF_ENQUEUE_TIMEOUT_MS 5000
+ 
  MODULE_IMPORT_NS(DMA_BUF);
  
  /* Reference counter handling */

diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge