Merge branch 'perf/urgent' into perf/core, to pick up fixed and resolve conflicts

Conflicts: kernel/events/core.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-11-10 20:48:12 +00:00 · 2016-09-05 12:09:59 +02:00 · 2016-09-05 12:09:59 +02:00 · 2cc538412a
commit 2cc538412a
parent 36e674a051 5876314875
793 changed files with 8793 additions and 4601 deletions
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
--- a/kernel/configs/tiny.config
+++ b/kernel/configs/tiny.config
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
--- a/kernel/printk/braille.c
+++ b/kernel/printk/braille.c
--- a/kernel/printk/nmi.c
+++ b/kernel/printk/nmi.c
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
--- a/kernel/time/timekeeping_debug.c
+++ b/kernel/time/timekeeping_debug.c
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c