Merge 5.13-rc4 into usb-next

We need the usb/thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/base/core.c
Simple merge

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

diff --cc drivers/usb/cdns3/cdnsp-gadget.c
Simple merge

diff --cc drivers/usb/chipidea/udc.c
Simple merge

diff --cc drivers/usb/core/devio.c
Simple merge

diff --cc drivers/usb/typec/mux.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpm.c
Simple merge

diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge

diff --cc include/linux/device.h
Simple merge