review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Apr 2023 06:56:59 +0000 (08:56 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 10 Apr 2023 06:56:59 +0000 (08:56 +0200)
commit	8e86652e3e7152bba80c3b4d03814e40ede1abc7
tree	1b31b94957fba52d8d223d03388b9afd8b522ad6	tree \| snapshot
parent	0246b15bbb43404d8d6f0ec86121c05515e0ed0b	commit \| diff
parent	09a9639e56c01c7a00d6c0ca63f4c7c41abe075d	commit \| diff

Merge 6.3-rc6 into usb-next

We need the USB fixes in here for testing, and this resolves two merge
conflicts, one pointed out by linux-next:

drivers/usb/dwc3/dwc3-pci.c
drivers/usb/host/xhci-pci.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Domain: System / Kernel;

RSS Atom

drivers/usb/dwc3/dwc3-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history