From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 7 Nov 2017 09:32:44 +0000 (+0100)
Subject: Merge branch 'linus' into locking/core, to resolve conflicts
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8c5db92a705d9e2c986adec475980d1120fa07b4;p=linux.git

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>
---

8c5db92a705d9e2c986adec475980d1120fa07b4
diff --cc include/linux/compiler-clang.h
index 5947a3e6c0e6d,54dfef70a0727..a06583e41f805
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
@@@ -1,4 -1,5 +1,5 @@@
+ /* SPDX-License-Identifier: GPL-2.0 */
 -#ifndef __LINUX_COMPILER_H
 +#ifndef __LINUX_COMPILER_TYPES_H
  #error "Please don't include <linux/compiler-clang.h> directly, include <linux/compiler.h> instead."
  #endif
  
diff --cc include/linux/compiler-gcc.h
index ce8e965646efb,bb78e5bdff263..2272ded07496d
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@@ -1,4 -1,5 +1,5 @@@
+ /* SPDX-License-Identifier: GPL-2.0 */
 -#ifndef __LINUX_COMPILER_H
 +#ifndef __LINUX_COMPILER_TYPES_H
  #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
  #endif
  
diff --cc include/linux/compiler-intel.h
index e438ac89c6927,523d1b74550f2..bfa08160db3a4
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@@ -1,4 -1,5 +1,5 @@@
+ /* SPDX-License-Identifier: GPL-2.0 */
 -#ifndef __LINUX_COMPILER_H
 +#ifndef __LINUX_COMPILER_TYPES_H
  #error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead."
  #endif
  
diff --cc include/uapi/linux/stddef.h
index d1f7cb732dfcf,f65b92e0e1f91..ee8220f8dcf5f
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@@ -1,4 -1,5 +1,5 @@@
+ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 -#include <linux/compiler.h>
 +#include <linux/compiler_types.h>
  
  #ifndef __always_inline
  #define __always_inline inline