Merge 5.12-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:56:10 +0000 (08:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Apr 2021 06:56:10 +0000 (08:56 +0200)
commitde800f290dfaa341f22acac22bc454ea2bbf8f71
tree02ac02009524e4a8a4c1b169583618690bdd2567
parentbee1f89aad2a51cd3339571bc8eadbb0dc88a683
parente49d033bddf5b565044e2abe4241353959bc9120
Merge 5.12-rc6 into usb-next

We want the USB fixes in here as well and it resolves a merge issue with
xhci-mtk.c

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