Merge 5.4-rc6 into usb-next

We need the USB fixes in here to build on top of.

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

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

diff --cc drivers/usb/dwc3/Kconfig
index cc43137,556a876..0d97e6b
--- 1/drivers/usb/dwc3/Kconfig
--- 2/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@@ -102,8 -102,9 +102,9 @@@ config USB_DWC3_MESON_G12
         depends on ARCH_MESON || COMPILE_TEST
         default USB_DWC3
         select USB_ROLE_SWITCH
+       select REGMAP_MMIO
         help
 -         Support USB2/3 functionality in Amlogic G12A platforms.
 +       Support USB2/3 functionality in Amlogic G12A platforms.
         Say 'Y' or 'M' if you have one such device.
  
  config USB_DWC3_OF_SIMPLE

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

diff --cc drivers/usb/renesas_usbhs/mod_gadget.c
Simple merge

diff --cc drivers/usb/storage/scsiglue.c
Simple merge