Merge branch 'linus' into locking/core, to fix up conflicts

Conflicts: mm/page_alloc.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-09-04 11:01:18 +02:00
parent d82fed7529 81a84ad3cb
commit edc2988c54
1536 changed files with 48718 additions and 53809 deletions
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1899,6 +1899,7 @@ static struct cftype files[] = {
 	{
 		.name = "memory_pressure",
 		.read_u64 = cpuset_read_u64,
+		.private = FILE_MEMORY_PRESSURE,
 	},

 	{