[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b9753171-8e70-92f2-9852-8d3a33f2c07c@fb.com>
Date: Thu, 21 Sep 2017 08:15:39 -0700
From: Alexei Starovoitov <ast@...com>
To: David Miller <davem@...emloft.net>, <peterz@...radead.org>
CC: <yhs@...com>, <rostedt@...dmis.org>, <daniel@...earbox.net>,
<netdev@...r.kernel.org>, <kernel-team@...com>
Subject: Re: [PATCH net-next v5 1/4] bpf: add helper bpf_perf_event_read_value
for perf event array map
On 9/20/17 4:07 PM, David Miller wrote:
> From: Peter Zijlstra <peterz@...radead.org>
> Date: Wed, 20 Sep 2017 19:26:51 +0200
>
>> Dave, could we have this in a topic tree of sorts, because I have a
>> pending series to rework all the timekeeping and it might be nice to not
>> have sfr run into all sorts of conflicts.
>
> If you want to merge it into your tree that's fine.
>
> But it means that any further development done on top of this
> work will need to go via you as well.
can we merge this set of patches into both net-next and tip ?
We did such tricks in the past to avoid merge conflicts and
everything went fine during merge window.
Powered by blists - more mailing lists