Merge 5.17-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Feb 2022 20:42:36 +0000 (21:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Feb 2022 20:42:36 +0000 (21:42 +0100)
commitca9400ef7f6793288db95ca658dede6e71e777d6
tree5e935bb2713f47d782ea75800e889729d3cbc0ee
parentf6a9a2d64dd168b7d71076c0e6b2be7db7cb7399
parent7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3
Merge 5.17-rc6 into usb-next

We need the USB fixes in here, and it resolves a merge conflict in:
drivers/usb/dwc3/dwc3-pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/usb/dwc3/dwc3-pci.c
drivers/usb/host/xhci.c