Merge tag 'v4.1' into p/abusse/merge_upgrade
authorAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:27:34 +0000 (21:27 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Mon, 18 Jan 2016 20:27:34 +0000 (21:27 +0100)
Linux 4.1

# Conflicts:
# include/linux/sched.h
# init/main.c

15 files changed:
1  2 
.gitignore
Makefile
arch/x86/Kconfig.debug
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
init/main.c
kernel/cpu.c
kernel/sched/cfs/core.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/idle.c
kernel/sysctl.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
@@@ -61,6 -61,6 +61,10 @@@ struct sched_param 
  
  #include <asm/processor.h>
  
++#ifdef CONFIG_MOD_SCHED
++#include <fw_task.h>
++#endif
++
  #define SCHED_ATTR_SIZE_VER0  48      /* sizeof first published struct */
  
  /*
diff --cc init/main.c
Simple merge
diff --cc kernel/cpu.c
  #include <linux/gfp.h>
  #include <linux/suspend.h>
  #include <linux/lockdep.h>
+ #include <linux/tick.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
diff --cc kernel/sysctl.c
Simple merge