Merge 5.12-rc6 into staging-next

Browse source

We need the staging fixes in here as well.

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

...

This commit is contained in:

Greg Kroah-Hartman 2021-04-05 08:57:44 +02:00

parent 507614ba25 e49d033bdd

commit e5c7bccc37

493 changed files with 4534 additions and 2126 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