Merge tag 'v5.13-rc6' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jun 2021 07:18:07 +0000 (09:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jun 2021 07:18:07 +0000 (09:18 +0200)
commit37fdb7c90f8cc2f41bdf2190ccc44a37bbf1a295
tree2f0c6fdba85b29cf3981053f87e504163aabb270
parent12f739798470288c8c1053484fe0281fe4cc5ea4
parent009c9aa5be652675a06d5211e1640e02bbb1c33d
Merge tag 'v5.13-rc6' into usb-next

We want the usb fixes in here as well, and this resolves some merge
issues with:
drivers/usb/dwc3/debugfs.c
drivers/usb/dwc3/gadget.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
13 files changed:
drivers/pci/probe.c
drivers/usb/cdns3/cdns3-gadget.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/function/f_hid.c
drivers/usb/gadget/function/f_printer.c
drivers/usb/musb/musb_core.c
drivers/usb/typec/mux.c
drivers/usb/typec/mux/intel_pmc_mux.c
drivers/usb/typec/tcpm/tcpm.c
drivers/usb/typec/tcpm/wcove.c
drivers/usb/typec/ucsi/ucsi.c