Merge 6.15-rc4 into usb-next

We need the USB fixes in here as well, and this resolves the following
merge conflicts that were reported in linux-next:

	drivers/usb/chipidea/ci_hdrc_imx.c
	drivers/usb/host/xhci.h

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
index c34298ccc39917d46f8988d725499e5e81ff2872,4f8bfd242b5953821b0069192e0bef8f4819f6a6..780f4d151345375735e3e3c0bb1b4c679511db06
--- 1/drivers/usb/chipidea/ci_hdrc_imx.c
--- 2/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@@ -338,16 -336,13 +338,23 @@@ static int ci_hdrc_imx_notify_event(str
        return ret;
  }
  
 +static irqreturn_t ci_wakeup_irq_handler(int irq, void *data)
 +{
 +      struct ci_hdrc_imx_data *imx_data = data;
 +
 +      disable_irq_nosync(irq);
 +      pm_runtime_resume(&imx_data->ci_pdev->dev);
 +
 +      return IRQ_HANDLED;
 +}
 +
+ static void ci_hdrc_imx_disable_regulator(void *arg)
+ {
+       struct ci_hdrc_imx_data *data = arg;
+ 
+       regulator_disable(data->hsic_pad_regulator);
+ }
+ 
  static int ci_hdrc_imx_probe(struct platform_device *pdev)
  {
        struct ci_hdrc_imx_data *data;

diff --cc drivers/usb/class/cdc-wdm.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
Simple merge