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

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

diff --cc ipc/ipc_sysctl.c
Simple merge

diff --cc ipc/mq_sysctl.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/kprobes.c
Simple merge

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

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

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

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/time/timer.c
Simple merge

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

diff --cc kernel/ucount.c
Simple merge

diff --cc kernel/watchdog.c
Simple merge