Merge 6.9-rc7 into usb-next

We want the USB fixes in here as well, and resolve a merge conflict in
drivers/usb/dwc3/core.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/dwc3/core.c
index 719305ab86c0b0f3413199a75647f4dcdef2f4a7,100041320e8dd2e80488b7dfdc372d373ea0d251..5c6a7e99a4b9e25c60d3efbc2020a0d1bc9a359c
--- 1/drivers/usb/dwc3/core.c
--- 2/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@@ -594,14 -596,19 +615,11 @@@ static int dwc3_core_ulpi_init(struct d
        return ret;
  }
  
 -/**
 - * dwc3_phy_setup - Configure USB PHY Interface of DWC3 Core
 - * @dwc: Pointer to our controller context structure
 - *
 - * Returns 0 on success. The USB PHY interfaces are configured but not
 - * initialized. The PHY interfaces and the PHYs get initialized together with
 - * the core in dwc3_core_init.
 - */
 -static int dwc3_phy_setup(struct dwc3 *dwc)
 +static int dwc3_ss_phy_setup(struct dwc3 *dwc, int index)
  {
-       unsigned int hw_mode;
        u32 reg;
  
-       hw_mode = DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0);
- 
 -      reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));
 +      reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(index));
  
        /*
         * Make sure UX_EXIT_PX is cleared as that causes issues with some

diff --cc drivers/usb/dwc3/core.h
Simple merge

diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge

diff --cc drivers/usb/gadget/function/uvc_configfs.c
Simple merge