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>
Šī revīzija ir iekļauta:
Ingo Molnar
2017-11-07 10:32:44 +01:00
revīzija 8c5db92a70
12937 mainīti faili ar 15821 papildinājumiem un 2464 dzēšanām

Parādīt failu

@@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
/*
* linux/fs/namei.c
*