]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 16 Aug 2024 22:43:16 +0000 (19:43 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 16 Aug 2024 22:43:16 +0000 (19:43 -0300)
To pick up the latest perf-tools merge for 6.11, i.e. to have the
current perf tools branch that is getting into 6.11 with the
perf-tools-next that is geared towards 6.12.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/perf/builtin-daemon.c

Simple merge