diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /arch/s390/numa | |
parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
download | linux-stable-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.gz linux-stable-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.bz2 linux-stable-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.zip |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 * |