Merge branch 'sched/core'

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/admin-guide/sysctl/kernel.rst
Simple merge

diff --cc arch/x86/kernel/smpboot.c
index 2ed45b036629d22ef9ba8232c4d9fc1db655f7d9,0936f5ba32229dbdc32a6a694f5396d107a2471c..9320285a5e295e3380ebbf5dff8b8cc2bd8866e8
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -232,10 -232,10 +232,9 @@@ static void notrace start_secondary(voi
        load_cr3(swapper_pg_dir);
        __flush_tlb_all();
  #endif
 -      cpu_init_exception_handling();
 -      cpu_init();
 +      cpu_init_secondary();
        rcu_cpu_starting(raw_smp_processor_id());
        x86_cpuinit.early_percpu_clock_init();
-       preempt_disable();
        smp_callin();
  
        enable_start_cpu0 = 0;

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

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

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

diff --cc kernel/sysctl.c
Simple merge