Merge 5.8-rc3 into usb-next

We want the USB fixes in here, and this resolves a merge issue found in
linux-next.

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

diff --cc drivers/usb/cdns3/ep0.c
index 04a522f5ae581db58e65d1fd9dd37a4894ee6d00,61ec5bb2b0ca351ca1e69481feada828f1a29fad..4bca730f6876cffc4154a39e69a6c3a40f0ed5d5
--- 1/drivers/usb/cdns3/ep0.c
--- 2/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.c
@@@ -327,11 -327,12 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
                if (!set || (tmode & 0xff) != 0)
                        return -EINVAL;
  
-               switch (tmode >> 8) {
+               tmode >>= 8;
+               switch (tmode) {
 -              case TEST_J:
 -              case TEST_K:
 -              case TEST_SE0_NAK:
 -              case TEST_PACKET:
 +              case USB_TEST_J:
 +              case USB_TEST_K:
 +              case USB_TEST_SE0_NAK:
 +              case USB_TEST_PACKET:
                        cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
                                               USB_CMD_STMODE |
                                               USB_STS_TMODE_SEL(tmode - 1));

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

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

diff --cc drivers/usb/gadget/udc/mv_udc_core.c
Simple merge