Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

diff --cc tools/perf/util/session.c
index 71bc608e0ec6328828030a9a37aef249f19a7726,00ab298bbb4bc998828687357bd5f6e4af26cdd0..c088d8f9b51cc9fcfd259019c9bb7c3d6c204a7e
--- 1/tools/perf/util/session.c
--- 2/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@@ -98,9 -98,7 +98,8 @@@ struct perf_session *perf_session__new(
        self->unknown_events = 0;
        self->machines = RB_ROOT;
        self->repipe = repipe;
-       self->ordered_samples.flush_limit = ULLONG_MAX;
        INIT_LIST_HEAD(&self->ordered_samples.samples_head);
 +      machine__init(&self->host_machine, "", HOST_KERNEL_ID);
  
        if (mode == O_RDONLY) {
                if (perf_session__open(self, force) < 0)

diff --cc tools/perf/util/session.h
Simple merge