From: Daniel Borkmann <daniel@iogearbox•net>
To: Peter Zijlstra <peterz@infradead•org>,
David Miller <davem@davemloft•net>
Cc: yhs@fb•com, rostedt@goodmis•org, ast@fb•com,
netdev@vger•kernel.org, kernel-team@fb•com
Subject: Re: [PATCH net-next v6 0/4] bpf: add two helpers to read perf event enabled/running time
Date: Thu, 05 Oct 2017 12:36:45 +0200 [thread overview]
Message-ID: <59D60B3D.4040702@iogearbox.net> (raw)
In-Reply-To: <20171005083437.v3yfluazdy5du7pi@hirez.programming.kicks-ass.net>
On 10/05/2017 10:34 AM, Peter Zijlstra wrote:
> On Wed, Oct 04, 2017 at 04:00:56PM -0700, David Miller wrote:
>> 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?
>
> 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.
Sounds good, we did something like this in the past as well I recall,
so lets make first patch isolated to only touch perf event area so
it can go into both trees, and the remaining pieces only for BPF bits
for net-next.
prev parent reply other threads:[~2017-10-05 10:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 22:42 [PATCH net-next v6 0/4] bpf: add two helpers to read perf event enabled/running time Yonghong Song
2017-10-02 22:42 ` [PATCH net-next v6 1/4] bpf: add helper bpf_perf_event_read_value for perf event array map Yonghong Song
2017-10-02 22:42 ` [PATCH net-next v6 2/4] bpf: add a test case for helper bpf_perf_event_read_value Yonghong Song
2017-10-02 22:42 ` [PATCH net-next v6 3/4] bpf: add helper bpf_perf_prog_read_value Yonghong Song
2017-10-02 22:42 ` [PATCH net-next v6 4/4] bpf: add a test case for " Yonghong Song
2017-10-04 23:00 ` [PATCH net-next v6 0/4] bpf: add two helpers to read perf event enabled/running time David Miller
2017-10-05 8:34 ` Peter Zijlstra
2017-10-05 10:36 ` Daniel Borkmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59D60B3D.4040702@iogearbox.net \
--to=daniel@iogearbox$(echo .)net \
--cc=ast@fb$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kernel-team@fb$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=yhs@fb$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox