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

# Conflicts:
# .gitignore
# include/linux/sched.h

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

diff --cc .gitignore
@@@ -97,5 -97,5 +97,8 @@@ x509.genke
  # Kconfig presets
  all.config
  
+ # Kdevelop4
+ *.kdev4
++
 +# Build directory
 +/build/
diff --cc Makefile
Simple merge
Simple merge
@@@ -1666,9 -1698,9 +1703,12 @@@ struct task_struct 
        unsigned int    sequential_io;
        unsigned int    sequential_io_avg;
  #endif
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+       unsigned long   task_state_change;
+ #endif
 +#ifdef CONFIG_MOD_SCHED
 +      struct fw_task fw_task;
 +#endif
  };
  
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
diff --cc init/main.c
@@@ -660,9 -666,9 +666,10 @@@ asmlinkage __visible void __init start_
        /* rootfs populating might need page-writeback */
        page_writeback_init();
        proc_root_init();
+       nsfs_init();
        cgroup_init();
        cpuset_init();
 +
        taskstats_init_early();
        delayacct_init();
  
diff --cc kernel/cpu.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge