Merge 5.12-rc6 into usb-next

Browse source

We want the USB fixes in here as well and it resolves a merge issue with
xhci-mtk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2021-04-05 08:56:10 +02:00

parent bee1f89aad e49d033bdd

commit de800f290d

492 changed files with 4525 additions and 2125 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

28

include/uapi/linux/blkpg.h

View file

16

include/uapi/linux/bpf.h

View file

5

include/uapi/linux/psample.h

View file