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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bcma/Kconfig
Simple merge

diff --cc drivers/bluetooth/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/dsa/lan9303.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcm63xx_enet.h
Simple merge

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

diff --cc drivers/net/ethernet/cavium/liquidio/Makefile
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/Makefile
Simple merge

diff --cc drivers/net/ethernet/cisco/enic/enic_clsf.h
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/Makefile
index 4ae524a352a29fd556f43bb85820b9fe1daeab4e,f83a3653b63bc95bd359dfe82b7e56c2fe8f6d34..b618091db091cb11a674bfe182e83d2d557ea4ce
--- 1/drivers/net/ethernet/freescale/fman/Makefile
--- 2/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 drivers/net/ethernet/freescale/fs_enet/fs_enet.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/Makefile
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/Makefile
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/Makefile
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/Makefile
Simple merge

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

diff --cc drivers/net/ethernet/sun/sunvnet_common.h
Simple merge

diff --cc drivers/net/phy/Makefile
Simple merge

diff --cc drivers/net/vrf.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/Makefile
Simple merge

diff --cc drivers/s390/net/qeth_core.h
Simple merge

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

diff --cc drivers/s390/net/qeth_core_mpc.h
Simple merge

diff --cc drivers/s390/net/qeth_l2.h
Simple merge

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

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

diff --cc drivers/thunderbolt/ctl.c
Simple merge

diff --cc drivers/thunderbolt/ctl.h
Simple merge

diff --cc drivers/thunderbolt/nhi.h
Simple merge

diff --cc drivers/thunderbolt/nhi_regs.h
Simple merge

diff --cc drivers/thunderbolt/switch.c
Simple merge

diff --cc drivers/thunderbolt/tb.h
Simple merge

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

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

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

diff --cc include/linux/byteorder/generic.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc include/net/netns/ipv4.h
Simple merge

diff --cc include/net/netns/ipv6.h
Simple merge

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

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

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

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

diff --cc include/net/tc_act/tc_gact.h
Simple merge

diff --cc include/net/tc_act/tc_ife.h
Simple merge

diff --cc include/net/tc_act/tc_mirred.h
Simple merge

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

diff --cc include/trace/events/bpf.h
Simple merge

diff --cc include/trace/events/fib6.h
Simple merge

diff --cc include/trace/events/xdp.h
Simple merge

diff --cc include/trace/perf.h
Simple merge

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

diff --cc include/uapi/linux/if_link.h
Simple merge

diff --cc include/uapi/linux/if_tun.h
Simple merge

diff --cc include/uapi/linux/if_tunnel.h
Simple merge

diff --cc include/uapi/linux/in6.h
Simple merge

diff --cc include/uapi/linux/ip6_tunnel.h
Simple merge

diff --cc include/uapi/linux/ipv6_route.h
Simple merge

diff --cc include/uapi/linux/openvswitch.h
Simple merge

diff --cc include/uapi/linux/pkt_sched.h
Simple merge

diff --cc include/uapi/linux/qrtr.h
Simple merge

diff --cc include/uapi/linux/rtnetlink.h
Simple merge

diff --cc include/uapi/linux/sctp.h
Simple merge

diff --cc include/uapi/linux/tc_act/tc_mirred.h
Simple merge

diff --cc include/uapi/linux/tcp.h
Simple merge

diff --cc include/uapi/linux/tipc.h
Simple merge

diff --cc kernel/bpf/Makefile
Simple merge

diff --cc kernel/trace/trace_syscalls.c
Simple merge

diff --cc lib/dynamic_queue_limits.c
Simple merge

diff --cc lib/once.c
Simple merge

diff --cc net/8021q/vlan.h
Simple merge

diff --cc net/bluetooth/hci_sysfs.c
Simple merge

diff --cc net/bridge/Makefile
Simple merge

diff --cc net/core/datagram.c
Simple merge

diff --cc net/core/net-traces.c
Simple merge

diff --cc net/decnet/dn_dev.c
Simple merge

diff --cc net/dsa/Makefile
index 2e7ac8bab19d35455d1752404343148fa825e392,3d3c74193d06e027b93b94c72735aa8e93ecbfac..e9a4a0f33e86c5f962be141981013c27ef5ca0a0
--- 1/net/dsa/Makefile
--- 2/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/ipv4/fib_semantics.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/mac80211/Makefile
Simple merge

diff --cc net/rds/ib.h
Simple merge

diff --cc net/sched/Makefile
Simple merge

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/sched/act_bpf.c
Simple merge

diff --cc net/sched/act_ife.c
Simple merge

diff --cc net/sched/act_mirred.c
Simple merge

diff --cc net/sctp/Makefile
Simple merge

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

diff --cc net/smc/smc_cdc.h
Simple merge

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

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

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

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

diff --cc net/tipc/Makefile
Simple merge

diff --cc net/vmw_vsock/Makefile
index 64afc06805da37eb663236b5b320684aee85f6ee,30a263320e4f51547f5e059b1dddf036c5d6336d..7c6f9a0b67b08f3a0fd955c6f9ecbe5f4481fd2b
--- 1/net/vmw_vsock/Makefile
--- 2/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 net/wireless/Makefile
Simple merge

diff --cc net/wireless/chan.c
Simple merge

diff --cc net/wireless/core.h
Simple merge

diff --cc net/wireless/nl80211.h
Simple merge

diff --cc net/wireless/sme.c
Simple merge

diff --cc net/wireless/util.c
Simple merge

diff --cc samples/bpf/Makefile
Simple merge

diff --cc samples/bpf/bpf_load.c
Simple merge

diff --cc samples/bpf/cgroup_helpers.c
Simple merge

diff --cc samples/bpf/tracex6_user.c
Simple merge

diff --cc samples/pktgen/pktgen_sample03_burst_single_flow.sh
Simple merge

diff --cc scripts/mod/devicetable-offsets.c
Simple merge

diff --cc security/selinux/include/classmap.h
Simple merge

diff --cc tools/Makefile
Simple merge

diff --cc tools/bpf/Makefile
index 325a35e1c28e8e7908e9c1ec06a3519673fc8811,0000000000000000000000000000000000000000..07a6697466ef2551017e4f19b6411c3cc78c6b74
mode 100644,000000..100644
--- 1/tools/bpf/Makefile
--- /dev/null
+++ 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

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

diff --cc tools/testing/selftests/bpf/bpf_helpers.h
Simple merge

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

diff --cc tools/testing/selftests/tc-testing/tdc.py
Simple merge

diff --cc tools/testing/selftests/tc-testing/tdc_config.py
Simple merge

diff --cc tools/testing/selftests/tc-testing/tdc_helper.py
Simple merge