Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse source

Simple overlapping changes in stmmac driver.

Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.

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

...

This commit is contained in:

David S. Miller 2018-07-03 10:26:50 +09:00

parent f6779e4e53 d0fbad0aec

commit 5cd3da4ba2

471 changed files with 3815 additions and 2447 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

1

lib/Kconfig.kasan

View file

2

lib/percpu_ida.c

View file

6

lib/scatterlist.c

View file

20

lib/test_bpf.c

View file

7

lib/test_printf.c

View file