projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 342cb7e 3906fe9)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 26 Oct 2021 14:03:02 +0000 (11:03 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 26 Oct 2021 14:03:02 +0000 (11:03 -0300)
commit3a55445f11e6b1dbdc1e7f2684a519089d2e163c
treece449fbd02b8dde1adf10bf4e2f291c9fa1fe4dctree | snapshot
parent342cb7ebf5e29fff4dc09ab2c8f37d710f8f5206commit | diff
parent3906fe9bb7f1a2c8667ae54e967dc8690824f4eacommit | diff
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up the fixes from upstream.

Fix simple conflict on session.c related to the file position fix that
went upstream and is touched by the active decomp changes in perf/core.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/session.c diff1 | diff2 | blob | history
Domain: System / Kernel;