summaryrefslogtreecommitdiffstats
path: root/net/atm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-11-03 20:26:51 -0400
committerDavid S. Miller <davem@davemloft.net>2017-11-03 20:26:51 -0400
commit2a171788ba7bb61995e98e8163204fc7880f63b2 (patch)
tree4150a94dd08323748116e5051e56ddee830d4812 /net/atm
parentbf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff)
parentd4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff)
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>
Diffstat (limited to 'net/atm')
-rw-r--r--net/atm/Makefile1
-rw-r--r--net/atm/addr.c1
-rw-r--r--net/atm/addr.h1
-rw-r--r--net/atm/atm_misc.c1
-rw-r--r--net/atm/atm_sysfs.c1
-rw-r--r--net/atm/common.h1
-rw-r--r--net/atm/ioctl.c1
-rw-r--r--net/atm/lec.h1
-rw-r--r--net/atm/lec_arpc.h1
-rw-r--r--net/atm/mpc.h1
-rw-r--r--net/atm/mpoa_caches.c1
-rw-r--r--net/atm/mpoa_caches.h1
-rw-r--r--net/atm/mpoa_proc.c1
-rw-r--r--net/atm/proc.c1
-rw-r--r--net/atm/protocols.h1
-rw-r--r--net/atm/pvc.c1
-rw-r--r--net/atm/raw.c1
-rw-r--r--net/atm/resources.c1
-rw-r--r--net/atm/resources.h1
-rw-r--r--net/atm/signaling.c1
-rw-r--r--net/atm/signaling.h1
-rw-r--r--net/atm/svc.c1
22 files changed, 22 insertions, 0 deletions
diff --git a/net/atm/Makefile b/net/atm/Makefile
index cc50bd1ff1de..bfec0f2d83b5 100644
--- a/net/atm/Makefile
+++ b/net/atm/Makefile
@@ -1,3 +1,4 @@
1# SPDX-License-Identifier: GPL-2.0
1# 2#
2# Makefile for the ATM Protocol Families. 3# Makefile for the ATM Protocol Families.
3# 4#
diff --git a/net/atm/addr.c b/net/atm/addr.c
index dcda35c66f15..0530b63f509a 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/addr.c - Local ATM address registry */ 2/* net/atm/addr.c - Local ATM address registry */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/addr.h b/net/atm/addr.h
index 6837e9e7eb13..da3f848411a0 100644
--- a/net/atm/addr.h
+++ b/net/atm/addr.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* net/atm/addr.h - Local ATM address registry */ 2/* net/atm/addr.h - Local ATM address registry */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
index 876fbe83e2e4..a30b83c1cb3f 100644
--- a/net/atm/atm_misc.c
+++ b/net/atm/atm_misc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/atm_misc.c - Various functions for use by ATM drivers */ 2/* net/atm/atm_misc.c - Various functions for use by ATM drivers */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL ICA */
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index 350bf62b2ae3..5d2fed9f5710 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* ATM driver model support. */ 2/* ATM driver model support. */
2 3
3#include <linux/kernel.h> 4#include <linux/kernel.h>
diff --git a/net/atm/common.h b/net/atm/common.h
index 959436b87182..d9d583712a91 100644
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* net/atm/common.h - ATM sockets (common part for PVC and SVC) */ 2/* net/atm/common.h - ATM sockets (common part for PVC and SVC) */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c
index bbd3b639992e..2ff0e5e470e3 100644
--- a/net/atm/ioctl.c
+++ b/net/atm/ioctl.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* ATM ioctl handling */ 2/* ATM ioctl handling */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/lec.h b/net/atm/lec.h
index 4149db1b7885..be0e2667bd8c 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* 2/*
2 * Lan Emulation client header file 3 * Lan Emulation client header file
3 * 4 *
diff --git a/net/atm/lec_arpc.h b/net/atm/lec_arpc.h
index d923f53812a3..1205d8792d28 100644
--- a/net/atm/lec_arpc.h
+++ b/net/atm/lec_arpc.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* 2/*
2 * Lec arp cache 3 * Lec arp cache
3 * 4 *
diff --git a/net/atm/mpc.h b/net/atm/mpc.h
index cfc7b745aa91..454abd07651a 100644
--- a/net/atm/mpc.h
+++ b/net/atm/mpc.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1#ifndef _MPC_H_ 2#ifndef _MPC_H_
2#define _MPC_H_ 3#define _MPC_H_
3 4
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
index 4ccaa16b1eb1..e01450bb32d6 100644
--- a/net/atm/mpoa_caches.c
+++ b/net/atm/mpoa_caches.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1#include <linux/types.h> 2#include <linux/types.h>
2#include <linux/atmmpc.h> 3#include <linux/atmmpc.h>
3#include <linux/slab.h> 4#include <linux/slab.h>
diff --git a/net/atm/mpoa_caches.h b/net/atm/mpoa_caches.h
index 30fe34841ced..6a266669ebf4 100644
--- a/net/atm/mpoa_caches.h
+++ b/net/atm/mpoa_caches.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1#ifndef MPOA_CACHES_H 2#ifndef MPOA_CACHES_H
2#define MPOA_CACHES_H 3#define MPOA_CACHES_H
3 4
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index 2df34eb5d65f..8a0c17e1c203 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ 2#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
2 3
3#ifdef CONFIG_PROC_FS 4#ifdef CONFIG_PROC_FS
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 4caca2a90ec4..642f9272ab95 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/proc.c - ATM /proc interface 2/* net/atm/proc.c - ATM /proc interface
2 * 3 *
3 * Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA 4 * Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA
diff --git a/net/atm/protocols.h b/net/atm/protocols.h
index acdfc856222d..18d4d008bac3 100644
--- a/net/atm/protocols.h
+++ b/net/atm/protocols.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* net/atm/protocols.h - ATM protocol handler entry points */ 2/* net/atm/protocols.h - ATM protocol handler entry points */
2 3
3/* Written 1995-1997 by Werner Almesberger, EPFL LRC */ 4/* Written 1995-1997 by Werner Almesberger, EPFL LRC */
diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index 040207ec399f..e1140b3bdcaa 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/pvc.c - ATM PVC sockets */ 2/* net/atm/pvc.c - ATM PVC sockets */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/raw.c b/net/atm/raw.c
index 821c0797553d..ee10e8d46185 100644
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/raw.c - Raw AAL0 and AAL5 transports */ 2/* net/atm/raw.c - Raw AAL0 and AAL5 transports */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 918244757b7d..bada395ecdb1 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/resources.c - Statically allocated resources */ 2/* net/atm/resources.c - Statically allocated resources */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/resources.h b/net/atm/resources.h
index 521431e30507..048232e4d4c6 100644
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* net/atm/resources.h - ATM-related resources */ 2/* net/atm/resources.h - ATM-related resources */
2 3
3/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index 0a20f6e953ac..6c11cdf4dd4c 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/signaling.c - ATM signaling */ 2/* net/atm/signaling.c - ATM signaling */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/signaling.h b/net/atm/signaling.h
index 08b2a69cc572..2df8220f7ab5 100644
--- a/net/atm/signaling.h
+++ b/net/atm/signaling.h
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* net/atm/signaling.h - ATM signaling */ 2/* net/atm/signaling.h - ATM signaling */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/net/atm/svc.c b/net/atm/svc.c
index 5589de7086af..c458adcbc177 100644
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0
1/* net/atm/svc.c - ATM SVC sockets */ 2/* net/atm/svc.c - ATM SVC sockets */
2 3
3/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ 4/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-17 03:21:12 -0400