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

Simple overlapping changes in bpf land wrt. bpf_helper_defs.h
handling.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_ptp.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/ptp/ptp_clock.c
Simple merge

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

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

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

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

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/sctp/stream.c
Simple merge

diff --cc net/sctp/transport.c
Simple merge

diff --cc tools/lib/bpf/Makefile
index d4790121adf4917f10641b520418bda6b8254381,97830e46d1a05e182b16b1baf049073638aa1ebf..d87830e7ea6326891779cf9107400f029b066d3b
--- 1/tools/lib/bpf/Makefile
--- 2/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@@ -160,7 -160,7 +161,7 @@@ all: fixde
  
  all_cmd: $(CMD_TARGETS) check
  
- $(BPF_IN_SHARED): force elfdep zdep bpfdep bpf_helper_defs.h
 -$(BPF_IN_SHARED): force elfdep bpfdep $(BPF_HELPER_DEFS)
++$(BPF_IN_SHARED): force elfdep zdep bpfdep $(BPF_HELPER_DEFS)
        @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
        (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \
        echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@@ -178,12 -178,12 +179,12 @@@
        echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true
        $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)"
  
- $(BPF_IN_STATIC): force elfdep zdep bpfdep bpf_helper_defs.h
 -$(BPF_IN_STATIC): force elfdep bpfdep $(BPF_HELPER_DEFS)
++$(BPF_IN_STATIC): force elfdep zdep bpfdep $(BPF_HELPER_DEFS)
        $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR)
  
- bpf_helper_defs.h: $(srctree)/tools/include/uapi/linux/bpf.h
+ $(BPF_HELPER_DEFS): $(srctree)/tools/include/uapi/linux/bpf.h
        $(Q)$(srctree)/scripts/bpf_helpers_doc.py --header              \
-               --file $(srctree)/tools/include/uapi/linux/bpf.h > bpf_helper_defs.h
+               --file $(srctree)/tools/include/uapi/linux/bpf.h > $(BPF_HELPER_DEFS)
  
  $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
  
@@@ -251,10 -250,9 +252,10 @@@ install_headers: $(BPF_HELPER_DEFS
                $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
                $(call do_install,btf.h,$(prefix)/include/bpf,644); \
                $(call do_install,libbpf_util.h,$(prefix)/include/bpf,644); \
 +              $(call do_install,libbpf_common.h,$(prefix)/include/bpf,644); \
                $(call do_install,xsk.h,$(prefix)/include/bpf,644); \
                $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \
-               $(call do_install,bpf_helper_defs.h,$(prefix)/include/bpf,644); \
+               $(call do_install,$(BPF_HELPER_DEFS),$(prefix)/include/bpf,644); \
                $(call do_install,bpf_tracing.h,$(prefix)/include/bpf,644); \
                $(call do_install,bpf_endian.h,$(prefix)/include/bpf,644); \
                $(call do_install,bpf_core_read.h,$(prefix)/include/bpf,644);

diff --cc tools/testing/selftests/bpf/.gitignore
index b139b3d75ebb05740d1bff32474adbb83fb068c2,1ff0a9f49c01ca82ea14678fba4b476202557da9..301ac12d5d6929312d2cb86feda66d29299792a4
--- 1/tools/testing/selftests/bpf/.gitignore
--- 2/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
@@@ -37,7 -38,6 +37,8 @@@ test_hashma
  test_btf_dump
  xdping
  test_cpp
 +*.skel.h
  /no_alu32
  /bpf_gcc
 +/tools
+ bpf_helper_defs.h

diff --cc tools/testing/selftests/bpf/Makefile
Simple merge