Re: [PATCH net-next v6 0/4] bpf: add two helpers to read perf event enabled/running time

On Wed, Oct 04, 2017 at 04:00:56PM -0700, David Miller wrote:

From: Yonghong Song <redacted>
Date: Mon, 2 Oct 2017 15:42:14 -0700

quoted

[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?

I think Alexei suggested that we merge the one patch in two branches and
let git sort it out. I _think_ I've done something similar before and it
worked.