Merge 6.4-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 May 2023 14:25:53 +0000 (15:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 May 2023 14:25:53 +0000 (15:25 +0100)
commit7e530d32a3655f15f1cf92e8aabed1bc3a21ee36
tree7d6cb1cc6588e0cb1b65bf8d1c610b0ca3cb04de
parent19b3cf44e18c202d696354d1947b9a74fbad046e
parent7877cb91f1081754a1487c144d85dc0d2e2e7fc4
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>
MAINTAINERS
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/dwc3/gadget.c
drivers/usb/host/uhci-pci.c
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci.h