From: David S. Miller <davem@davemloft.net>
Date: Sat, 4 Nov 2017 00:26:51 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2a171788ba7bb61995e98e8163204fc7880f63b2;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/davem/net

Files removed in 'net-next' had their license header updated
in 'net'.  We take the remove from 'net-next'.

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

2a171788ba7bb61995e98e8163204fc7880f63b2
diff --cc drivers/net/ethernet/freescale/fman/Makefile
index 4ae524a352a2,f83a3653b63b..b618091db091
--- a/drivers/net/ethernet/freescale/fman/Makefile
+++ b/drivers/net/ethernet/freescale/fman/Makefile
@@@ -1,9 -1,10 +1,10 @@@
+ # SPDX-License-Identifier: GPL-2.0
  subdir-ccflags-y +=  -I$(srctree)/drivers/net/ethernet/freescale/fman
  
 -obj-$(CONFIG_FSL_FMAN) += fsl_fman.o
 -obj-$(CONFIG_FSL_FMAN) += fsl_fman_port.o
 -obj-$(CONFIG_FSL_FMAN) += fsl_mac.o
 +obj-$(CONFIG_FSL_FMAN) += fsl_dpaa_fman.o
 +obj-$(CONFIG_FSL_FMAN) += fsl_dpaa_fman_port.o
 +obj-$(CONFIG_FSL_FMAN) += fsl_dpaa_mac.o
  
 -fsl_fman-objs	:= fman_muram.o fman.o fman_sp.o fman_keygen.o
 -fsl_fman_port-objs := fman_port.o
 -fsl_mac-objs:= mac.o fman_dtsec.o fman_memac.o fman_tgec.o
 +fsl_dpaa_fman-objs	:= fman_muram.o fman.o fman_sp.o fman_keygen.o
 +fsl_dpaa_fman_port-objs := fman_port.o
 +fsl_dpaa_mac-objs:= mac.o fman_dtsec.o fman_memac.o fman_tgec.o
diff --cc net/dsa/Makefile
index 2e7ac8bab19d,3d3c74193d06..e9a4a0f33e86
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@@ -1,6 -1,7 +1,7 @@@
+ # SPDX-License-Identifier: GPL-2.0
  # the core
  obj-$(CONFIG_NET_DSA) += dsa_core.o
 -dsa_core-y += dsa.o dsa2.o legacy.o port.o slave.o switch.o
 +dsa_core-y += dsa.o dsa2.o legacy.o master.o port.o slave.o switch.o
  
  # tagging formats
  dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o
diff --cc net/vmw_vsock/Makefile
index 64afc06805da,30a263320e4f..7c6f9a0b67b0
--- a/net/vmw_vsock/Makefile
+++ b/net/vmw_vsock/Makefile
@@@ -1,5 -1,5 +1,6 @@@
+ # SPDX-License-Identifier: GPL-2.0
  obj-$(CONFIG_VSOCKETS) += vsock.o
 +obj-$(CONFIG_VSOCKETS_DIAG) += vsock_diag.o
  obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o
  obj-$(CONFIG_VIRTIO_VSOCKETS) += vmw_vsock_virtio_transport.o
  obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += vmw_vsock_virtio_transport_common.o
diff --cc tools/bpf/Makefile
index 325a35e1c28e,000000000000..07a6697466ef
mode 100644,000000..100644
--- a/tools/bpf/Makefile
+++ b/tools/bpf/Makefile
@@@ -1,47 -1,0 +1,48 @@@
++# SPDX-License-Identifier: GPL-2.0
 +prefix = /usr
 +
 +CC = gcc
 +LEX = flex
 +YACC = bison
 +MAKE = make
 +
 +CFLAGS += -Wall -O2
 +CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
 +
 +%.yacc.c: %.y
 +	$(YACC) -o $@ -d $<
 +
 +%.lex.c: %.l
 +	$(LEX) -o $@ $<
 +
 +all: bpf_jit_disasm bpf_dbg bpf_asm bpftool
 +
 +bpf_jit_disasm : CFLAGS += -DPACKAGE='bpf_jit_disasm'
 +bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl
 +bpf_jit_disasm : bpf_jit_disasm.o
 +
 +bpf_dbg : LDLIBS = -lreadline
 +bpf_dbg : bpf_dbg.o
 +
 +bpf_asm : LDLIBS =
 +bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o
 +bpf_exp.lex.o : bpf_exp.yacc.c
 +
 +clean: bpftool_clean
 +	rm -rf *.o bpf_jit_disasm bpf_dbg bpf_asm bpf_exp.yacc.* bpf_exp.lex.*
 +
 +install: bpftool_install
 +	install bpf_jit_disasm $(prefix)/bin/bpf_jit_disasm
 +	install bpf_dbg $(prefix)/bin/bpf_dbg
 +	install bpf_asm $(prefix)/bin/bpf_asm
 +
 +bpftool:
 +	$(MAKE) -C bpftool
 +
 +bpftool_install:
 +	$(MAKE) -C bpftool install
 +
 +bpftool_clean:
 +	$(MAKE) -C bpftool clean
 +
 +.PHONY: bpftool FORCE