Commit 0db49b72bce26341274b74fd968501489a361ae3
Exists in
master
and in
20 other branches
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits) sched/tracing: Add a new tracepoint for sleeptime sched: Disable scheduler warnings during oopses sched: Fix cgroup movement of waking process sched: Fix cgroup movement of newly created process sched: Fix cgroup movement of forking process sched: Remove cfs bandwidth period check in tg_set_cfs_period() sched: Fix load-balance lock-breaking sched: Replace all_pinned with a generic flags field sched: Only queue remote wakeups when crossing cache boundaries sched: Add missing rcu_dereference() around ->real_parent usage [S390] fix cputime overflow in uptime_proc_show [S390] cputime: add sparse checking and cleanup sched: Mark parent and real_parent as __rcu sched, nohz: Fix missing RCU read lock sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer sched, nohz: Fix the idle cpu check in nohz_idle_balance sched: Use jump_labels for sched_feat sched/accounting: Fix parameter passing in task_group_account_field sched/accounting: Fix user/system tick double accounting sched/accounting: Re-use scheduler statistics for the root cgroup ... Fix up conflicts in - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h usecs_to_cputime64() vs the sparse cleanups - kernel/sched/fair.c, kernel/time/tick-sched.c scheduler changes in multiple branches
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 57 changed files Side-by-side Diff
- arch/ia64/include/asm/cputime.h
- arch/powerpc/include/asm/cputime.h
- arch/s390/appldata/appldata_os.c
- arch/s390/include/asm/cputime.h
- arch/x86/include/asm/i387.h
- drivers/cpufreq/cpufreq_conservative.c
- drivers/cpufreq/cpufreq_ondemand.c
- drivers/cpufreq/cpufreq_stats.c
- drivers/macintosh/rack-meter.c
- fs/proc/array.c
- fs/proc/stat.c
- fs/proc/uptime.c
- include/asm-generic/cputime.h
- include/linux/kernel_stat.h
- include/linux/latencytop.h
- include/linux/sched.h
- include/trace/events/sched.h
- kernel/Makefile
- kernel/acct.c
- kernel/cpu.c
- kernel/exit.c
- kernel/fork.c
- kernel/itimer.c
- kernel/posix-cpu-timers.c
- kernel/sched.c
- kernel/sched/Makefile
- kernel/sched/auto_group.c
- kernel/sched/auto_group.h
- kernel/sched/clock.c
- kernel/sched/core.c
- kernel/sched/cpupri.c
- kernel/sched/cpupri.h
- kernel/sched/debug.c
- kernel/sched/fair.c
- kernel/sched/features.h
- kernel/sched/idle_task.c
- kernel/sched/rt.c
- kernel/sched/sched.h
- kernel/sched/stats.c
- kernel/sched/stats.h
- kernel/sched/stop_task.c
- kernel/sched_autogroup.c
- kernel/sched_autogroup.h
- kernel/sched_clock.c
- kernel/sched_cpupri.c
- kernel/sched_cpupri.h
- kernel/sched_debug.c
- kernel/sched_fair.c
- kernel/sched_features.h
- kernel/sched_idletask.c
- kernel/sched_rt.c
- kernel/sched_stats.h
- kernel/sched_stoptask.c
- kernel/signal.c
- kernel/sys.c
- kernel/time/tick-sched.c
- kernel/tsacct.c