Merge branch 'linus' into sched/core

Conflicts: kernel/Makefile
2026-09-24 18:16:04 +00:00 · 2008-11-19 09:44:37 +01:00 · 2008-11-19 09:44:37 +01:00 · 3ac3ba0b39
commit 3ac3ba0b39
parent 934352f214 7f0f598a00
651 changed files with 25387 additions and 11994 deletions
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
--- a/kernel/profile.c
+++ b/kernel/profile.c
--- a/kernel/relay.c
+++ b/kernel/relay.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c