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>

diff --cc tools/perf/util/session.c
index 51bf2efceb7f526ba055bc31fcc988350aafd8f6,352f16076e01f70ef91ebebdd7809d8cf4c0c05f..d8857d1b6d7c19e926f252a4b47a07ee4eb75dd2
--- 1/tools/perf/util/session.c
--- 2/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;