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

One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.

Signed-off-by: David S. Miller <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
index 9ce5a0dbcde1bbf568b55c9013016349d64a33af,69fc13046ac718aa763d2719d7d964df3fe64893..e43040c9f9ee7f1a7e4ea9de54661a220adb357e
--- 1/drivers/net/dsa/bcm_sf2.c
--- 2/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@@ -1236,13 -1215,11 +1236,13 @@@ static int bcm_sf2_sw_remove(struct pla
        struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
  
        priv->wol_ports_mask = 0;
+       /* Disable interrupts */
+       bcm_sf2_intr_disable(priv);
        dsa_unregister_switch(priv->dev->ds);
        bcm_sf2_cfp_exit(priv->dev->ds);
-       /* Disable all ports and interrupts */
-       bcm_sf2_sw_suspend(priv->dev->ds);
        bcm_sf2_mdio_unregister(priv);
 +      if (priv->type == BCM7278_DEVICE_ID && !IS_ERR(priv->rcdev))
 +              reset_control_assert(priv->rcdev);
  
        return 0;
  }

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
Simple merge

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hnae3.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
Simple merge

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

diff --cc drivers/net/ethernet/intel/ice/ice_sched.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
Simple merge

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

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

diff --cc include/net/neighbour.h
Simple merge

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tls.h
Simple merge

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

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

diff --cc net/netfilter/ipset/ip_set_core.c
Simple merge

diff --cc net/netfilter/ipset/ip_set_hash_ipmac.c
Simple merge

diff --cc net/netfilter/ipset/ip_set_hash_net.c
Simple merge

diff --cc net/netfilter/ipset/ip_set_hash_netnet.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nf_tables_offload.c
Simple merge

diff --cc net/nfc/netlink.c
Simple merge

diff --cc net/smc/smc_pnet.c
Simple merge

diff --cc net/tls/tls_device.c
Simple merge

diff --cc net/tls/tls_main.c
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc net/vmw_vsock/virtio_transport_common.c
Simple merge

diff --cc samples/bpf/Makefile
index 4df11ddb9c753cfd15630a8ffbf800e88f242085,42b571cde17781f9951a90b44d9b0f85f37a3a72..d88c012752394d3f5769850dd2c4d684ce661983
--- 1/samples/bpf/Makefile
--- 2/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -168,38 -171,21 +168,39 @@@ always += ibumad_kern.
  always += hbm_out_kern.o
  always += hbm_edt_kern.o
  
 -KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include
 -KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/
 -KBUILD_HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
 -KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include
 -KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf
 -KBUILD_HOSTCFLAGS += -DHAVE_ATTR_TEST=0
 +ifeq ($(ARCH), arm)
 +# Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux
 +# headers when arm instruction set identification is requested.
 +ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))
 +BPF_EXTRA_CFLAGS := $(ARM_ARCH_SELECTOR)
 +TPROGS_CFLAGS += $(ARM_ARCH_SELECTOR)
 +endif
 +
 +TPROGS_CFLAGS += -Wall -O2
 +TPROGS_CFLAGS += -Wmissing-prototypes
 +TPROGS_CFLAGS += -Wstrict-prototypes
 +
 +TPROGS_CFLAGS += -I$(objtree)/usr/include
 +TPROGS_CFLAGS += -I$(srctree)/tools/lib/bpf/
 +TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
 +TPROGS_CFLAGS += -I$(srctree)/tools/lib/
 +TPROGS_CFLAGS += -I$(srctree)/tools/include
 +TPROGS_CFLAGS += -I$(srctree)/tools/perf
++TPROGS_CFLAGS += -DHAVE_ATTR_TEST=0
  
 -HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable
 +ifdef SYSROOT
 +TPROGS_CFLAGS += --sysroot=$(SYSROOT)
 +TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib
 +endif
 +
 +TPROGCFLAGS_bpf_load.o += -Wno-unused-variable
  
 -KBUILD_HOSTLDLIBS             += $(LIBBPF) -lelf
 -HOSTLDLIBS_tracex4            += -lrt
 -HOSTLDLIBS_trace_output       += -lrt
 -HOSTLDLIBS_map_perf_test      += -lrt
 -HOSTLDLIBS_test_overhead      += -lrt
 -HOSTLDLIBS_xdpsock            += -pthread
 +TPROGS_LDLIBS                 += $(LIBBPF) -lelf
 +TPROGLDLIBS_tracex4           += -lrt
 +TPROGLDLIBS_trace_output      += -lrt
 +TPROGLDLIBS_map_perf_test     += -lrt
 +TPROGLDLIBS_test_overhead     += -lrt
 +TPROGLDLIBS_xdpsock           += -pthread
  
  # Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
  #  make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang

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