Skip to content
Commit a560a567 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e89fbb5b d206a76d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment