From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751516AbdKTPua (ORCPT <rfc822;w@1wt.eu>);
        Mon, 20 Nov 2017 10:50:30 -0500
Received: from mga02.intel.com ([134.134.136.20]:4174 "EHLO mga02.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751301AbdKTPu3 (ORCPT <rfc822;Linux-kernel@vger.kernel.org>);
        Mon, 20 Nov 2017 10:50:29 -0500
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.44,427,1505804400"; 
   d="scan'208";a="3915938"
Date: Mon, 20 Nov 2017 07:50:27 -0800
From: Andi Kleen <ak@linux.intel.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: "Jin, Yao" <yao.jin@linux.intel.com>, acme@kernel.org,
        jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com,
        alexander.shishkin@linux.intel.com, Linux-kernel@vger.kernel.org,
        kan.liang@intel.com, yao.jin@intel.com
Subject: Re: [PATCH v1 0/9] perf stat: Enable '--per-thread' on all threads
Message-ID: <20171120155027.GF28112@tassilo.jf.intel.com>
References: <1511189024-19908-1-git-send-email-yao.jin@linux.intel.com>
 <20171120092648.GA30958@krava>
 <4fa51069-25b0-f53b-b0fa-34320445e2b4@linux.intel.com>
 <20171120122952.GA12500@krava>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171120122952.GA12500@krava>
User-Agent: Mutt/1.9.1 (2017-09-22)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> > Hi Jiri,
> > 
> > This patch set is based on the latest perf/core branch.
> > 
> > I pull the branch right now and try the build again, the building is OK.
> > 
> > Could you tell me which branch you are testing on?
> 
> ugh.. I was over Andi's changes.. I'll recheck

Yes the two patch kits conflicts. Whoever gets merged first, the
other has to rebase.

-Andi