diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
tree | 4150a94dd08323748116e5051e56ddee830d4812 /init | |
parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz |
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 'init')
-rw-r--r-- | init/Makefile | 1 | ||||
-rw-r--r-- | init/calibrate.c | 1 | ||||
-rw-r--r-- | init/do_mounts.h | 1 | ||||
-rw-r--r-- | init/do_mounts_initrd.c | 1 | ||||
-rw-r--r-- | init/do_mounts_md.c | 1 | ||||
-rw-r--r-- | init/do_mounts_rd.c | 1 | ||||
-rw-r--r-- | init/init_task.c | 1 | ||||
-rw-r--r-- | init/initramfs.c | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/init/Makefile b/init/Makefile index c4fb45525d08..1dbb23787290 100644 --- a/init/Makefile +++ b/init/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the linux kernel. # diff --git a/init/calibrate.c b/init/calibrate.c index ce635dccf3d9..f3831272f113 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* calibrate.c: default delay calibration * * Excised from init/main.c diff --git a/init/do_mounts.h b/init/do_mounts.h index 282d65bfd674..5b05c8f93f47 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/init.h> diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index a1000ca29fc9..53d4f0f326e7 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Many of the syscalls used in this file expect some of the arguments * to be __user pointers not __kernel pointers. To limit the sparse diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c index 8cb6db54285b..3f733c760a8c 100644 --- a/init/do_mounts_md.c +++ b/init/do_mounts_md.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Many of the syscalls used in this file expect some of the arguments * to be __user pointers not __kernel pointers. To limit the sparse diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index dd4104c9aa12..99e0b649fc0e 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Many of the syscalls used in this file expect some of the arguments * to be __user pointers not __kernel pointers. To limit the sparse diff --git a/init/init_task.c b/init/init_task.c index 66787e30a419..9325fee7dc82 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/init_task.h> #include <linux/export.h> #include <linux/mqueue.h> diff --git a/init/initramfs.c b/init/initramfs.c index e64bf7b4c1ca..7046feffef6b 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Many of the syscalls used in this file expect some of the arguments * to be __user pointers not __kernel pointers. To limit the sparse |