Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

Browse source

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-07-20 14:45:10 -07:00

parent 40999f11ce 48e5aee81f

commit c4c5551df1

598 changed files with 5366 additions and 2963 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

2

include/uapi/linux/ethtool.h

View file

102

include/uapi/linux/rseq.h

View file

4

include/uapi/linux/tcp.h

View file

50

include/uapi/linux/types_32_64.h

View file