diff options
| author | Ingo Molnar | 2017-11-07 10:32:44 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-07 10:32:44 +0100 |
| commit | 8c5db92a705d9e2c986adec475980d1120fa07b4 (patch) | |
| tree | 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d /arch/m68k/mm | |
| parent | x86/paravirt: Set up the virt_spin_lock_key after static keys get initialized (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.tar.gz kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.tar.xz kernel-qcow2-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.zip | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/compiler-clang.h
include/linux/compiler-gcc.h
include/linux/compiler-intel.h
include/uapi/linux/stddef.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m68k/mm')
| -rw-r--r-- | arch/m68k/mm/Makefile | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/cache.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/hwtest.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/kmap.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/mcfmmu.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/memory.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/motorola.c | 1 | ||||
| -rw-r--r-- | arch/m68k/mm/sun3mmu.c | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile index cfbf3205724a..b3adb5253393 100644 --- a/arch/m68k/mm/Makefile +++ b/arch/m68k/mm/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the linux m68k-specific parts of the memory manager. # diff --git a/arch/m68k/mm/cache.c b/arch/m68k/mm/cache.c index 3d84c1f2ffb2..079e64898e6a 100644 --- a/arch/m68k/mm/cache.c +++ b/arch/m68k/mm/cache.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/cache.c * diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 2795e4ca09d7..127d7c1f2090 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/fault.c * diff --git a/arch/m68k/mm/hwtest.c b/arch/m68k/mm/hwtest.c index fb8be4dd38c4..fe99aa99987e 100644 --- a/arch/m68k/mm/hwtest.c +++ b/arch/m68k/mm/hwtest.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* Tests for presence or absence of hardware registers. * This code was originally in atari/config.c, but I noticed * that it was also in drivers/nubus/nubus.c and I wanted to diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index a6ffead9bef5..e85acd131fa8 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/init.c * diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c index 6e4955bc542b..c2a38321c96d 100644 --- a/arch/m68k/mm/kmap.c +++ b/arch/m68k/mm/kmap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/kmap.c * diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index 87131cd3bc8f..8d1408583cf4 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Based upon linux/arch/m68k/mm/sun3mmu.c * Based upon linux/arch/ppc/mm/mmu_context.c diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index 4902b681a9fc..b86a2e21693b 100644 --- a/arch/m68k/mm/memory.c +++ b/arch/m68k/mm/memory.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/memory.c * diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 7cb72dbc2eaa..e490ecc7842c 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/motorola.c * diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index 177d776de1a0..4a9979908357 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/mm/sun3mmu.c * |