git.maquefel.me Git - linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 23 Jan 2023 14:38:08 +0000 (15:38 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 23 Jan 2023 14:38:08 +0000 (15:38 +0100)
commit	e3e9fc7fa7ad221cc2e7b207d514cc84ed393251
tree	7de34df1844075bd3ed0391546d74ae9dab5fcae	tree \| snapshot
parent	dd2f003e4e85b154754d5a83e0c3b1b517d1f802	commit \| diff
parent	2241ab53cbb5cdb08a6b2d4688feb13971058f65	commit \| diff

Merge 6.2-rc5 into usb-next

We need the USB fixes in here and this resolves merge conflicts as
reported in linux-next in the following files:
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/typec/ucsi/ucsi.c

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

12 files changed:

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/configfs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_fs.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-ring.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/onboard_usb_hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/typec/altmodes/displayport.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/typec/tcpm/tcpm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/typec/ucsi/ucsi.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/typec/ucsi/ucsi.h	diff1 \|	diff2 \|	blob \| history
include/linux/usb.h	diff1 \|	diff2 \|	blob \| history