]> Gentwo Git Trees - linux/.git/commit
Merge 6.11-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Sep 2024 06:40:22 +0000 (08:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Sep 2024 06:40:22 +0000 (08:40 +0200)
commitf299cd11f7539482e87b2d2d527968a26b33f0ec
treeabc4443b5666f567f3b83bf2a0cefe87a8930101
parent9c0c11bb87b09a8b7cdc21ca1090e7b36abe9d09
parentda3ea35007d0af457a0afc87e84fddaebc4e0b63
Merge 6.11-rc7 into usb-next

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

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/udc/cdns2/cdns2-gadget.c
drivers/usb/typec/ucsi/ucsi.c
drivers/usb/typec/ucsi/ucsi.h