Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file...

Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/sched/sysctl.h
Simple merge

diff --cc include/trace/events/sched.h
Simple merge

diff --cc kernel/Makefile
index f99d908,b3d51e2..a4d1aa8
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -6,9 -6,9 +6,9 @@@ obj-y     = fork.o exec_domain.o panic.
            cpu.o exit.o itimer.o time.o softirq.o resource.o \
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 -          rcupdate.o extable.o params.o posix-timers.o \
 +          extable.o params.o posix-timers.o \
-           kthread.o wait.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
 -          hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 +          hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o
  

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge