diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:32:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:32:44 +0100 |
| commit | 8c5db92a705d9e2c986adec475980d1120fa07b4 (patch) | |
| tree | 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d /ipc | |
| parent | ca5d376e17072c1b60c3fee66f3be58ef018952d (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
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 'ipc')
| -rw-r--r-- | ipc/Makefile | 1 | ||||
| -rw-r--r-- | ipc/compat.c | 1 | ||||
| -rw-r--r-- | ipc/msg.c | 1 | ||||
| -rw-r--r-- | ipc/namespace.c | 1 | ||||
| -rw-r--r-- | ipc/sem.c | 1 | ||||
| -rw-r--r-- | ipc/shm.c | 1 | ||||
| -rw-r--r-- | ipc/syscall.c | 1 | ||||
| -rw-r--r-- | ipc/util.c | 1 | ||||
| -rw-r--r-- | ipc/util.h | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/ipc/Makefile b/ipc/Makefile index 9c200e544434..c2558c430f51 100644 --- a/ipc/Makefile +++ b/ipc/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the linux ipc. # diff --git a/ipc/compat.c b/ipc/compat.c index b17bf93d7b49..5ab8225923af 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * 32 bit compatibility code for System V IPC * diff --git a/ipc/msg.c b/ipc/msg.c index 06be5a9adfa4..bce7ac1c8099 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/ipc/msg.c * Copyright (C) 1992 Krishna Balasubramanian diff --git a/ipc/namespace.c b/ipc/namespace.c index fc850c526698..f59a89966f92 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/ipc/namespace.c * Copyright (C) 2006 Pavel Emelyanov <xemul@openvz.org> OpenVZ, SWsoft Inc. diff --git a/ipc/sem.c b/ipc/sem.c index f7385bce5fd3..b2698ebdcb31 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/ipc/sem.c * Copyright (C) 1992 Krishna Balasubramanian diff --git a/ipc/shm.c b/ipc/shm.c index badac463e2c8..bd652755d32c 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/ipc/shm.c * Copyright (C) 1992, 1993 Krishna Balasubramanian diff --git a/ipc/syscall.c b/ipc/syscall.c index 667022746ca5..26b45db2e007 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * sys_ipc() is the old de-multiplexer for the SysV IPC calls. * diff --git a/ipc/util.c b/ipc/util.c index 78755873cc5b..79b30eee32cd 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/ipc/util.c * Copyright (C) 1992 Krishna Balasubramanian diff --git a/ipc/util.h b/ipc/util.h index b21297bc11eb..579112d90016 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/ipc/util.h * Copyright (C) 1999 Christoph Rohland |