Merge remote-tracking branch 'linus/master' into testing

1 files changed, 1 insertions, 0 deletions

diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 5ad266403098..eeb7ac62b9e3 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -13,6 +13,7 @@ struct thread {
         };
         struct map_groups       mg;
         pid_t                   pid;
+        pid_t                   ppid;
         char                    shortname[3];
         bool                    comm_set;
         char                    *comm;