Merge 6.0-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 06:03:23 +0000 (08:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 06:03:23 +0000 (08:03 +0200)
commita956f91247da3fe71e4d5f7da1f6dd8bae7c3c21
treedcbfa79369938f1349af5b39a68dee698861a815
parent4e55e22d3d9aa50ef1ba059bf3a53aa61109c179
parent7e18e42e4b280c85b76967a9106a13ca61c16179
Merge 6.0-rc4 into usb-next

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

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/dwc3-qcom.c
drivers/usb/dwc3/gadget.c
drivers/usb/host/xhci-plat.c
drivers/usb/host/xhci.h