Merge 6.4-rc4 into usb-next

We need the USB fixes in here and this resolves merge conflicts in:
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/udc/core.c

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

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc drivers/usb/host/uhci-pci.c
Simple merge

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

diff --cc drivers/usb/host/xhci.h
Simple merge