]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge v6.8-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Feb 2024 05:53:50 +0000 (06:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Feb 2024 05:53:50 +0000 (06:53 +0100)
commita560a5672826fc1e057068bda93b3d4c98d037a2
tree7bc3774f7ec5fa2346a86b7158f975b9a762697a
parente89fbb5bc21a10a0de2bb878d4df09f538dc523b
parentd206a76d7d2726f3b096037f2079ce0bd3ba329b
Merge v6.8-rc6 into usb-next

We need it here for the USB fixes, and it resolves a merge conflict as
reported in linux-next in drivers/usb/roles/class.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/gadget.c
drivers/usb/roles/class.c
drivers/usb/typec/tcpm/tcpm.c