Merge 6.9-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 May 2024 08:38:01 +0000 (09:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 May 2024 08:38:01 +0000 (09:38 +0100)
commitadeab5bfb81840dc4be7ae20324bbf03b2b53eb2
tree2b56c0fad02af5c99e0a741cefc49dad5ba7384c
parenta2cf936ebef291ef7395172b9e2f624779fb6dc0
parentdd5a440a31fae6e459c0d6271dddd62825505361
Merge 6.9-rc7 into usb-next

We want the USB fixes in here as well, and resolve a merge conflict in
drivers/usb/dwc3/core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/usb/core/hub.c
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/function/uvc_configfs.c