Merge branch 'master' into next

Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au> Ok'd by Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>
2026-10-16 22:39:48 +00:00 · 2011-01-10 09:46:24 +11:00 · 2011-01-10 09:46:24 +11:00 · d2e7ad1922
commit d2e7ad1922
parent d03a5d888f 0c21e3aaf6
4718 changed files with 366735 additions and 228497 deletions
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/hw_breakpoint.c
+++ b/kernel/hw_breakpoint.c
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
--- a/kernel/rcutiny_plugin.h
+++ b/kernel/rcutiny_plugin.h
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
--- a/kernel/rcutree_trace.c
+++ b/kernel/rcutree_trace.c
--- a/kernel/resource.c
+++ b/kernel/resource.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_autogroup.c
+++ b/kernel/sched_autogroup.c
--- a/kernel/sched_autogroup.h
+++ b/kernel/sched_autogroup.h
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
--- a/kernel/srcu.c
+++ b/kernel/srcu.c
--- a/kernel/sys.c
+++ b/kernel/sys.c
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
--- a/kernel/time/timecompare.c
+++ b/kernel/time/timecompare.c
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
--- a/kernel/timer.c
+++ b/kernel/timer.c
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
--- a/kernel/trace/power-traces.c
+++ b/kernel/trace/power-traces.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/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
--- a/kernel/user.c
+++ b/kernel/user.c
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c