Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc kernel/bpf/core.c
Simple merge

diff --cc kernel/bpf/local_storage.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc tools/bpf/bpftool/Documentation/bpftool-map.rst
Simple merge

diff --cc tools/bpf/bpftool/Documentation/bpftool-prog.rst
Simple merge

diff --cc tools/bpf/bpftool/common.c
Simple merge

diff --cc tools/bpf/bpftool/main.h
index 3e8979567cf1bd603d1330f5ec86b6336ec0c7c1,a8bf1e2d9818debfc200701f21d438d432e093fc..7431669fae0af0cec1a5707e291d1fcfa67c6cbf
--- 1/tools/bpf/bpftool/main.h
--- 2/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@@ -129,9 -127,8 +129,9 @@@ int cmd_select(const struct cmd *cmds, 
  int get_fd_type(int fd);
  const char *get_fd_type_name(enum bpf_obj_type type);
  char *get_fdinfo(int fd, const char *key);
- int open_obj_pinned(char *path);
+ int open_obj_pinned(char *path, bool quiet);
  int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type);
 +int mount_bpffs_for_pin(const char *name);
  int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32));
  int do_pin_fd(int fd, const char *name);
  

diff --cc tools/bpf/bpftool/prog.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge