Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index 9ffda95e199b5ec9f7b57a6bdf3c96ac32673092,81a0a537a7bfabad5c252005610f59517efdd53a..2a87c0e22ba5190e7e90643ca31127ced0432bac
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11060,7 -10969,7 +11060,8 @@@ M:   Pengyu Luo <mitltlatltl@gmail.com
  S:    Maintained
  F:    Documentation/devicetree/bindings/platform/huawei,gaokun-ec.yaml
  F:    drivers/platform/arm64/huawei-gaokun-ec.c
 +F:    drivers/power/supply/huawei-gaokun-battery.c
+ F:    drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
  F:    include/linux/platform_data/huawei-gaokun-ec.h
  
  HUGETLB SUBSYSTEM

diff --cc drivers/usb/gadget/function/f_hid.c
Simple merge

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

diff --cc include/sound/jack.h
Simple merge

diff --cc sound/core/jack.c
Simple merge