Merge 6.2-rc5 into usb-next

We need the USB fixes in here and this resolves merge conflicts as
reported in linux-next in the following files:
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/typec/ucsi/ucsi.c

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/gadget/configfs.c
Simple merge

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

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

diff --cc drivers/usb/host/xhci.c
index 748c715,2b280be..f61fda4
--- 1/drivers/usb/host/xhci.c
--- 2/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5502,8 -5516,8 +5516,10 @@@ void xhci_init_driver(struct hc_driver 
                        drv->check_bandwidth = over->check_bandwidth;
                if (over->reset_bandwidth)
                        drv->reset_bandwidth = over->reset_bandwidth;
+               if (over->update_hub_device)
+                       drv->update_hub_device = over->update_hub_device;
 +              if (over->hub_control)
 +                      drv->hub_control = over->hub_control;
        }
  }
  EXPORT_SYMBOL_GPL(xhci_init_driver);

diff --cc drivers/usb/host/xhci.h
index f718418,dcee7f3..7547037
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1943,8 -1944,8 +1944,10 @@@ struct xhci_driver_overrides 
                             struct usb_host_endpoint *ep);
        int (*check_bandwidth)(struct usb_hcd *, struct usb_device *);
        void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
+       int (*update_hub_device)(struct usb_hcd *hcd, struct usb_device *hdev,
+                           struct usb_tt *tt, gfp_t mem_flags);
 +      int (*hub_control)(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 +                         u16 wIndex, char *buf, u16 wLength);
  };
  
  #define       XHCI_CFC_DELAY          10

diff --cc drivers/usb/misc/onboard_usb_hub.c
Simple merge

diff --cc drivers/usb/typec/altmodes/displayport.c
Simple merge

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

diff --cc drivers/usb/typec/ucsi/ucsi.c
index d048094,1292241..00fc867
--- 1/drivers/usb/typec/ucsi/ucsi.c
--- 2/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@@ -1551,14 -1426,20 +1557,27 @@@ void ucsi_unregister(struct ucsi *ucsi
                ucsi_unregister_altmodes(&ucsi->connector[i],
                                         UCSI_RECIPIENT_CON);
                ucsi_unregister_port_psy(&ucsi->connector[i]);
-               if (ucsi->connector[i].wq)
+ 
+               if (ucsi->connector[i].wq) {
+                       struct ucsi_work *uwork;
+ 
+                       mutex_lock(&ucsi->connector[i].lock);
+                       /*
+                        * queue delayed items immediately so they can execute
+                        * and free themselves before the wq is destroyed
+                        */
+                       list_for_each_entry(uwork, &ucsi->connector[i].partner_tasks, node)
+                               mod_delayed_work(ucsi->connector[i].wq, &uwork->work, 0);
+                       mutex_unlock(&ucsi->connector[i].lock);
                        destroy_workqueue(ucsi->connector[i].wq);
+               }
++
 +              usb_power_delivery_unregister_capabilities(ucsi->connector[i].port_sink_caps);
 +              ucsi->connector[i].port_sink_caps = NULL;
 +              usb_power_delivery_unregister_capabilities(ucsi->connector[i].port_source_caps);
 +              ucsi->connector[i].port_source_caps = NULL;
 +              usb_power_delivery_unregister(ucsi->connector[i].pd);
 +              ucsi->connector[i].pd = NULL;
                typec_unregister_port(ucsi->connector[i].port);
        }
  

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

diff --cc include/linux/usb.h
Simple merge