]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 522c35e a39b6ac)
Merge 6.7-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2023 07:44:28 +0000 (08:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2023 07:44:28 +0000 (08:44 +0100)
We need the USB fixes in here as well to build off of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/net/usb/r8152.c patch | diff1 | diff2 | blob | history
drivers/usb/host/xhci-pci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/usb/r8152.c
Simple merge
diff --cc drivers/usb/host/xhci-pci.c
Simple merge
XArray, radix tree and IDR