From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net-next v6 0/4] bpf: add two helpers to read perf
 event enabled/running time
Date: Wed, 04 Oct 2017 16:00:56 -0700 (PDT)
Message-ID: <20171004.160056.801262768847050741.davem@davemloft.net>
References: <20171002224218.3181418-1-yhs@fb.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: peterz@infradead.org, rostedt@goodmis.org, ast@fb.com,
        daniel@iogearbox.net, netdev@vger.kernel.org, kernel-team@fb.com
To: yhs@fb.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([184.105.139.130]:54550 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750951AbdJDXA5 (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 4 Oct 2017 19:00:57 -0400
In-Reply-To: <20171002224218.3181418-1-yhs@fb.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Yonghong Song <yhs@fb.com>
Date: Mon, 2 Oct 2017 15:42:14 -0700

> [Dave, Peter,
> 
>  Previous communcation shows that this patch may potentially have
>  merge conflict with upcoming tip changes in the next merge window.
> 
>  Could you advise how this patch should proceed?
> 
>  Thanks!
> ]

Indeed, Peter how do you want to handle this?

Thanks.