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 /arch/s390/numa | |
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 'arch/s390/numa')
-rw-r--r-- | arch/s390/numa/mode_emu.c | 1 | ||||
-rw-r--r-- | arch/s390/numa/numa.c | 1 | ||||
-rw-r--r-- | arch/s390/numa/numa_mode.h | 1 | ||||
-rw-r--r-- | arch/s390/numa/toptree.c | 1 | ||||
-rw-r--r-- | arch/s390/numa/toptree.h | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c index cfd08384f0ab..83b222c57609 100644 --- a/arch/s390/numa/mode_emu.c +++ b/arch/s390/numa/mode_emu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NUMA support for s390 * diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c index f576f1073378..06a80434cfe6 100644 --- a/arch/s390/numa/numa.c +++ b/arch/s390/numa/numa.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NUMA support for s390 * diff --git a/arch/s390/numa/numa_mode.h b/arch/s390/numa/numa_mode.h index 08953b0b1c7f..dfd3e2784081 100644 --- a/arch/s390/numa/numa_mode.h +++ b/arch/s390/numa/numa_mode.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * NUMA support for s390 * diff --git a/arch/s390/numa/toptree.c b/arch/s390/numa/toptree.c index 26f622b1cd11..21d1e8a1546d 100644 --- a/arch/s390/numa/toptree.c +++ b/arch/s390/numa/toptree.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * NUMA support for s390 * diff --git a/arch/s390/numa/toptree.h b/arch/s390/numa/toptree.h index bdf502027af4..5246371ec713 100644 --- a/arch/s390/numa/toptree.h +++ b/arch/s390/numa/toptree.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * NUMA support for s390 * |