From: Arnaldo Carvalho de Melo Date: Tue, 26 Oct 2021 14:03:02 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf/core X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3a55445f11e6b1dbdc1e7f2684a519089d2e163c;p=linux.git 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 --- 3a55445f11e6b1dbdc1e7f2684a519089d2e163c diff --cc tools/perf/util/session.c index 51bf2efceb7f5,352f16076e01f..d8857d1b6d7c1 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@@ -2122,8 -2116,8 +2122,8 @@@ fetch_decomp_event(u64 head, size_t mma static int __perf_session__process_decomp_events(struct perf_session *session) { s64 skip; - u64 size, file_pos = 0; + u64 size; - struct decomp *decomp = session->decomp_last; + struct decomp *decomp = session->active_decomp->decomp_last; if (!decomp) return 0;