]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge v6.14-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Mar 2025 07:16:31 +0000 (08:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Mar 2025 07:16:31 +0000 (08:16 +0100)
commit525b139fb4033a9ba5abd6ca3f6a6baa3b2fe3d4
treec4a9e8ebaf299e5baef11cc0893580e8804abbe8
parentb331a3d8097fad4e541d212684192f21fedbd6e5
parent80e54e84911a923c40d7bee33a34c1b4be148d7a
Merge v6.14-rc6 into usb-next

Resolves the merge conflict with:
drivers/usb/typec/ucsi/ucsi_acpi.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hub.c
drivers/usb/dwc3/gadget.c
drivers/usb/host/xhci-mem.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/typec/ucsi/ucsi.c
drivers/usb/typec/ucsi/ucsi.h
drivers/usb/typec/ucsi/ucsi_acpi.c
drivers/usb/typec/ucsi/ucsi_ccg.c