Merge branch 'perf/urgent'

Browse source

avoid merge conflicts with urgent

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

...

This commit is contained in:

Peter Zijlstra 2025-04-08 20:55:45 +02:00

parent 0af2f6be1b 56799bc035

commit 5dcba48994

3 changed files with 34 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/perf_event.h

View file

70

kernel/events/core.c

View file

15

kernel/events/uprobes.c

View file