Merge tag 'v3.16' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:25:45 +0000 (20:25 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 19:25:45 +0000 (20:25 +0100)
Linux 3.16

# Conflicts:
# Makefile

17 files changed:
1  2 
.gitignore
Makefile
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/kthread.c
kernel/sched/cfs/core.c
kernel/sched/cfs/cpupri.c
kernel/sched/cfs/debug.c
kernel/sched/cfs/fair.c
kernel/sched/cfs/features.h
kernel/sched/cfs/rt.c
kernel/sched/cfs/sched.h
kernel/sched/cfs/stop_task.c
kernel/sched/idle.c
kernel/sysctl.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
@@@ -629,12 -658,9 +658,10 @@@ asmlinkage __visible void __init start_
        signals_init();
        /* rootfs populating might need page-writeback */
        page_writeback_init();
- #ifdef CONFIG_PROC_FS
        proc_root_init();
- #endif
        cgroup_init();
        cpuset_init();
 +
        taskstats_init_early();
        delayacct_init();
  
diff --cc kernel/cpu.c
  #include <linux/gfp.h>
  #include <linux/suspend.h>
  #include <linux/lockdep.h>
+ #include <trace/events/power.h>
  
 +#ifdef CONFIG_MOD_SCHED
 +    #include <fw_comm.h>
 +#endif
 +
  #include "smpboot.h"
  
  #ifdef CONFIG_SMP
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  
  #include <trace/events/power.h>
  
 -#include "sched.h"
++#ifdef CONFIG_MOD_SCHED
++#include <os/linux.h>
++#else
++#include "cfs/sched.h"
++#endif
  static int __read_mostly cpu_idle_force_poll;
  
  void cpu_idle_poll_ctrl(bool enable)
diff --cc kernel/sysctl.c
Simple merge