Merge 5.12-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/usb/dwc3/gadget.c
Simple merge

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

diff --cc drivers/usb/typec/tipd/core.c
Simple merge