From: David S. Miller <davem@davemloft.net>
Date: Sat, 9 Nov 2019 19:04:37 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.5-rc1~174^2~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14684b93019a2d2ece0df5acaf921924541b928d;p=thirdparty%2Flinux.git

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 <davem@davemloft.net>
---

14684b93019a2d2ece0df5acaf921924541b928d
diff --cc drivers/net/dsa/bcm_sf2.c
index 9ce5a0dbcde1b,69fc13046ac71..e43040c9f9ee7
--- a/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 samples/bpf/Makefile
index 4df11ddb9c753,42b571cde1778..d88c012752394
--- a/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