Merge 5.18-rc5 into usb-next

We need the USB fixes in here, and this resolves a merge issue in
drivers/usb/dwc3/drd.c

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

diff --cc Documentation/devicetree/bindings/usb/samsung,exynos-usb2.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/usb/dwc3/drd.c
index f277bebdaa09a17d2cff3683670b720b176876c6,8cad9e7d3368725145fc27457c70efa641764a13..039bf241769afb789f7f09130e7af91eba62f12d
--- 1/drivers/usb/dwc3/drd.c
--- 2/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@@ -539,11 -585,14 +539,10 @@@ int dwc3_drd_init(struct dwc3 *dwc
        int ret, irq;
  
        if (ROLE_SWITCH &&
-           device_property_read_bool(dwc->dev, "usb-role-switch")) {
-               ret = dwc3_setup_role_switch(dwc);
-               if (ret < 0)
-                       return ret;
-       } else if (dwc->edev) {
+           device_property_read_bool(dwc->dev, "usb-role-switch"))
+               return dwc3_setup_role_switch(dwc);
+ 
 -      dwc->edev = dwc3_get_extcon(dwc);
 -      if (IS_ERR(dwc->edev))
 -              return PTR_ERR(dwc->edev);
 -
+       if (dwc->edev) {
                dwc->edev_nb.notifier_call = dwc3_drd_notifier;
                ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
                                               &dwc->edev_nb);

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

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

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

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

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

diff --cc sound/usb/midi.c
Simple merge