Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2018 06:10:54 +0000 (22:10 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Nov 2018 06:10:54 +0000 (22:10 -0800)
commite561bb29b650d2817d10a4858f1817836ed08399
tree0bc92b5bb8a287a8e4a88732f3c64b56d126da58
parent62e3a931788223048120357ab3f29dcb55c5ef79
parent60b548237fed4b4164bab13c994dd9615f6c4323
Merge git://git./linux/kernel/git/davem/net

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

Signed-off-by: David S. Miller <davem@davemloft.net>
15 files changed:
MAINTAINERS
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/phy/phy_device.c
drivers/s390/net/qeth_core_main.c
include/linux/filter.h
kernel/bpf/core.c
kernel/bpf/local_storage.c
kernel/bpf/verifier.c
net/ipv4/tcp_input.c
tools/bpf/bpftool/Documentation/bpftool-map.rst
tools/bpf/bpftool/Documentation/bpftool-prog.rst
tools/bpf/bpftool/common.c
tools/bpf/bpftool/main.h
tools/bpf/bpftool/prog.c
tools/testing/selftests/bpf/test_verifier.c