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 <[email protected]>

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

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

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