]> www.infradead.org Git - nvme.git/commit
projects / nvme.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: bf373d2 59b723c)
Merge v6.12-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Nov 2024 08:55:37 +0000 (09:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Nov 2024 08:56:08 +0000 (09:56 +0100)
commit85c4efbe608887cbce675fad3288172046f74713
tree42aa0a76ec945920d04344a6c2a7f7c86d054c28tree
parentbf373d2919d98f3d1fe1b19a0304f72fe74386d9commit | diff
parent59b723cd2adbac2a34fc8e12c74ae26ae45bf230commit | diff
Merge v6.12-rc6 into usb-next

We need the USB fixes in here as well, and this resolves a merge
conflict in:
drivers/usb/typec/tcpm/tcpm.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20241101150730.090dc30f@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/usb/host/xhci-pci.c diff1 | diff2 | blob | history
drivers/usb/host/xhci-ring.c diff1 | diff2 | blob | history
drivers/usb/typec/class.c diff1 | diff2 | blob | history
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c diff1 | diff2 | blob | history
drivers/usb/typec/tcpm/tcpm.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.