Merge 5.5-rc2 into staging-next

Browse source

We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next

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

...

This commit is contained in:

Greg Kroah-Hartman 2019-12-16 09:06:50 +01:00

parent f59aba2f75 d1eef1c619

commit b3bb164aa5

422 changed files with 3498 additions and 2333 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

40

include/uapi/linux/io_uring.h

View file