Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc kernel/sched/fair.c
Simple merge

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

diff --cc tools/perf/bench/Build
Simple merge

diff --cc tools/perf/bench/bench.h
Simple merge

diff --cc tools/perf/builtin-bench.c
Simple merge