From: Stanislav Fomichev <sdf@google.com>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree
Date: Tue, 19 Feb 2019 16:45:46 -0800 [thread overview]
Message-ID: <CAKH8qBuoYKPMhHn6Xzo=nEBevBt93c4+9cAVW7BZZwpNj46SCA@mail.gmail.com> (raw)
In-Reply-To: <CAADnVQK3qg2k67LRiOqDmFnELrFOD1dLkrNbAvbMyu6xGpjBLw@mail.gmail.com>
On Tue, Feb 19, 2019 at 4:41 PM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > tools/testing/selftests/bpf/test_progs.c
> >
> > between commit:
> >
> > f6be4d16039b ("selftests/bpf: make sure signal interrupts BPF_PROG_TEST_RUN")
>
> Ouch. Thanks for the heads up.
>
> Daniel,
> should we drop this one from bpf tree ?
> I don't think it's strictly necessary.
Yeah, those can go via the bpf-next three as well, not very critical.
OTOH, I don't understand why is there a conflict? bpf and bpf-next
adding tests in the same place/file? Those can be trivially resolved
when bpf and bpf-next are merged in the next window.
>
> > from the bpf tree and commits:
> >
> > bf0f0fd93945 ("selftests/bpf: add simple BPF_PROG_TEST_RUN examples for flow dissector")
> > ab963beb9f5d ("selftests/bpf: add bpf_spin_lock C test")
> > ba72a7b4badb ("selftests/bpf: test for BPF_F_LOCK")
> >
next prev parent reply other threads:[~2019-02-20 0:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 0:37 linux-next: manual merge of the net-next tree with the bpf tree Stephen Rothwell
2019-02-20 0:41 ` Alexei Starovoitov
2019-02-20 0:45 ` Stanislav Fomichev [this message]
2019-02-20 1:03 ` Stephen Rothwell
2019-02-20 0:48 ` Daniel Borkmann
2019-02-20 3:03 ` Stanislav Fomichev
-- strict thread matches above, loose matches on Subject: below --
2022-10-04 1:24 Stephen Rothwell
2022-10-04 2:07 ` Jakub Kicinski
2022-10-04 22:45 ` Stephen Rothwell
2022-09-23 0:45 Stephen Rothwell
2021-10-27 0:12 Stephen Rothwell
2021-06-22 1:06 Stephen Rothwell
2021-04-08 3:11 Stephen Rothwell
2021-04-08 3:02 Stephen Rothwell
2021-03-29 1:29 Stephen Rothwell
2021-03-29 8:28 ` Jiri Olsa
2020-07-16 1:59 Stephen Rothwell
2020-05-26 3:12 Stephen Rothwell
2020-05-26 5:45 ` Björn Töpel
2019-06-06 1:34 Stephen Rothwell
2018-12-14 0:56 Stephen Rothwell
2018-12-03 2:16 Stephen Rothwell
2018-12-03 2:03 Stephen Rothwell
2018-08-01 1:35 Stephen Rothwell
2018-08-01 4:23 ` Yonghong Song
2018-07-26 1:19 Stephen Rothwell
2018-07-26 15:32 ` Martin KaFai Lau
2018-01-09 0:21 Stephen Rothwell
2018-01-09 0:29 ` Alexei Starovoitov
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='CAKH8qBuoYKPMhHn6Xzo=nEBevBt93c4+9cAVW7BZZwpNj46SCA@mail.gmail.com' \
--to=sdf@google.com \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).