Merge v6.8-rc6 into usb-next

We need it here for the USB fixes, and it resolves a merge conflict as
reported in linux-next in drivers/usb/roles/class.c

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

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

diff --cc drivers/usb/roles/class.c
index 4ad03c93c17f17c3f3c7d3877f25af16052bf6d2,70165dd86b5de958ab4f5fe0d1573988977be425..d7aa913ceb8a0bf8531f27ea474c8cd86a505781
--- 1/drivers/usb/roles/class.c
--- 2/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@@ -379,12 -361,8 +388,14 @@@ usb_role_switch_register(struct device 
                return ERR_PTR(ret);
        }
  
 +      if (dev_fwnode(&sw->dev)) {
 +              ret = component_add(&sw->dev, &connector_ops);
 +              if (ret)
 +                      dev_warn(&sw->dev, "failed to add component\n");
 +      }
 +
+       sw->registered = true;
+ 
        /* TODO: Symlinks for the host port and the device controller. */
  
        return sw;
@@@ -399,11 -377,10 +410,12 @@@ EXPORT_SYMBOL_GPL(usb_role_switch_regis
   */
  void usb_role_switch_unregister(struct usb_role_switch *sw)
  {
 -      if (!IS_ERR_OR_NULL(sw)) {
 -              sw->registered = false;
 -              device_unregister(&sw->dev);
 -      }
 +      if (IS_ERR_OR_NULL(sw))
 +              return;
++      sw->registered = false;
 +      if (dev_fwnode(&sw->dev))
 +              component_del(&sw->dev, &connector_ops);
 +      device_unregister(&sw->dev);
  }
  EXPORT_SYMBOL_GPL(usb_role_switch_unregister);
  

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