]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 4bd3803 eb5e56d)
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 6 Aug 2024 17:01:06 +0000 (14:01 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 6 Aug 2024 17:01:06 +0000 (14:01 -0300)
commit37ce8a562a9f54d5eb4d35727e93dfb90925e349
tree80fce14de786b6b48cda0a14a745112b92d0aea6tree
parent4bd380390fcce5c77610bc9067a9a97cfd999402commit | diff
parenteb5e56d1491297e0881c95824e2050b7c205f0d4commit | diff
Merge remote-tracking branch 'torvalds/master' into perf-tools-next

To pick a patch that albeit being for tools/perf/ directory went thru a
different tree and ended up breaking some recent tests introduced in the
perf-tools-next tree to validate duplicate events in the JSON
performance event files.

Link: https://lore.kernel.org/lkml/ZrIqDMg7cBVhstYU@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.