Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

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

...

This commit is contained in:

David S. Miller 2019-08-27 14:23:31 -07:00

parent d00ee466a0 9e8312f5e1

commit 68aaf44595

280 changed files with 2819 additions and 1507 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

5

include/uapi/linux/jffs2.h

View file

5

include/uapi/linux/netfilter/xt_nfacct.h

View file

2

include/uapi/linux/rds.h

View file