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-Tag: iommu-v4.15-rc3~11^2~141
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2a171788ba7bb61995e98e8163204fc7880f63b2;p=users%2Fdwmw2%2Flinux.git

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>
---

2a171788ba7bb61995e98e8163204fc7880f63b2
diff --cc drivers/net/ethernet/freescale/fman/Makefile
index 4ae524a352a29,f83a3653b63bc..b618091db091c
--- 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 2e7ac8bab19d3,3d3c74193d06e..e9a4a0f33e86c
--- 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 64afc06805da3,30a263320e4f5..7c6f9a0b67b08
--- 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