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>

diff --cc arch/alpha/include/asm/atomic.h
Simple merge

diff --cc arch/alpha/include/asm/rwsem.h
Simple merge

diff --cc arch/alpha/include/asm/spinlock.h
Simple merge

diff --cc arch/arc/kernel/smp.c
Simple merge

diff --cc arch/arm/include/asm/spinlock.h
Simple merge

diff --cc arch/ia64/include/asm/rwsem.h
Simple merge

diff --cc arch/ia64/include/asm/spinlock.h
Simple merge

diff --cc arch/m32r/include/asm/spinlock.h
Simple merge

diff --cc arch/metag/include/asm/spinlock.h
Simple merge

diff --cc arch/metag/include/asm/spinlock_lnkget.h
Simple merge

diff --cc arch/metag/include/asm/spinlock_lock1.h
Simple merge

diff --cc arch/mips/kernel/pm-cps.c
Simple merge

diff --cc arch/parisc/include/asm/atomic.h
Simple merge

diff --cc arch/parisc/include/asm/spinlock.h
Simple merge

diff --cc arch/s390/include/asm/rwsem.h
Simple merge

diff --cc arch/s390/include/asm/spinlock.h
Simple merge

diff --cc arch/s390/lib/spinlock.c
Simple merge

diff --cc arch/sparc/include/asm/atomic_32.h
Simple merge

diff --cc arch/sparc/include/asm/ptrace.h
Simple merge

diff --cc arch/sparc/include/asm/spinlock_32.h
Simple merge

diff --cc arch/sparc/include/asm/spinlock_64.h
Simple merge

diff --cc arch/um/include/shared/init.h
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/mmu_context.h
Simple merge

diff --cc arch/x86/include/asm/qspinlock.h
Simple merge

diff --cc arch/x86/include/asm/rwsem.h
Simple merge

diff --cc arch/x86/include/asm/spinlock.h
Simple merge

diff --cc arch/x86/include/asm/vgtod.h
Simple merge

diff --cc arch/x86/kernel/ldt.c
Simple merge

diff --cc arch/x86/xen/spinlock.c
Simple merge

diff --cc drivers/md/dm-stats.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/tap.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/usb/host/uhci-hcd.h
Simple merge

diff --cc fs/crypto/keyinfo.c
Simple merge

diff --cc fs/fcntl.c
Simple merge

diff --cc fs/fs_pin.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc fs/ncpfs/dir.c
Simple merge

diff --cc fs/overlayfs/readdir.c
Simple merge

diff --cc fs/proc/array.c
Simple merge

diff --cc fs/proc_namespace.c
Simple merge

diff --cc fs/readdir.c
Simple merge

diff --cc include/asm-generic/atomic-long.h
Simple merge

diff --cc include/asm-generic/qrwlock_types.h
Simple merge

diff --cc include/asm-generic/rwsem.h
Simple merge

diff --cc include/linux/atomic.h
Simple merge

diff --cc include/linux/average.h
Simple merge

diff --cc include/linux/bitops.h
Simple merge

diff --cc include/linux/compiler-clang.h
index 5947a3e,54dfef7..a06583e
--- 1/include/linux/compiler-clang.h
--- 2/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
@@@ -1,4 -1,5 +1,5 @@@
 -#ifndef __LINUX_COMPILER_H
+ /* SPDX-License-Identifier: GPL-2.0 */
 +#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 ce8e965,bb78e5b..2272ded
--- 1/include/linux/compiler-gcc.h
--- 2/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@@ -1,4 -1,5 +1,5 @@@
 -#ifndef __LINUX_COMPILER_H
+ /* SPDX-License-Identifier: GPL-2.0 */
 +#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 e438ac8,523d1b7..bfa0816
--- 1/include/linux/compiler-intel.h
--- 2/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@@ -1,4 -1,5 +1,5 @@@
 -#ifndef __LINUX_COMPILER_H
+ /* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef __LINUX_COMPILER_TYPES_H
  #error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead."
  #endif
  

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/completion.h
Simple merge

diff --cc include/linux/dcache.h
Simple merge

diff --cc include/linux/dynamic_queue_limits.h
Simple merge

diff --cc include/linux/genetlink.h
Simple merge

diff --cc include/linux/genhd.h
Simple merge

diff --cc include/linux/huge_mm.h
Simple merge

diff --cc include/linux/jump_label.h
Simple merge

diff --cc include/linux/jump_label_ratelimit.h
Simple merge

diff --cc include/linux/linkage.h
Simple merge

diff --cc include/linux/lockdep.h
Simple merge

diff --cc include/linux/netfilter/nfnetlink.h
Simple merge

diff --cc include/linux/rculist.h
Simple merge

diff --cc include/linux/rtnetlink.h
Simple merge

diff --cc include/linux/rwsem.h
Simple merge

diff --cc include/linux/spinlock.h
Simple merge

diff --cc include/linux/workqueue.h
Simple merge

diff --cc include/net/ip_vs.h
Simple merge

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc include/uapi/linux/stddef.h
index d1f7cb7,f65b92e..ee8220f
--- 1/include/uapi/linux/stddef.h
--- 2/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@@ -1,4 -1,5 +1,5 @@@
 -#include <linux/compiler.h>
+ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +#include <linux/compiler_types.h>
  
  #ifndef __always_inline
  #define __always_inline inline

diff --cc kernel/acct.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/locking/rwsem.c
Simple merge

diff --cc kernel/locking/spinlock.c
Simple merge

diff --cc kernel/seccomp.c
Simple merge

diff --cc kernel/task_work.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_stack.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc lib/assoc_array.c
Simple merge

diff --cc lib/dynamic_queue_limits.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/slab.h
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
Simple merge

diff --cc scripts/headers_install.sh
Simple merge

diff --cc sound/firewire/amdtp-stream.h
Simple merge

diff --cc tools/arch/x86/include/asm/atomic.h
Simple merge

diff --cc tools/include/asm-generic/atomic-gcc.h
Simple merge

diff --cc tools/perf/util/session.h
Simple merge

diff --cc tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
Simple merge