From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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: Mon, 8 Jan 2018 16:29:16 -0800 [thread overview]
Message-ID: <20180109002914.447kcn4xqrkdtqql@ast-mbp> (raw)
In-Reply-To: <20180109112125.78277253@canb.auug.org.au>
On Tue, Jan 09, 2018 at 11:21:25AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_align.c
>
> between commit:
>
> 2b36047e7889 ("selftests/bpf: fix test_align")
>
> from the bpf tree and commit:
>
> 6a28b446b7d2 ("selftests/bpf: adjust test_align expected output")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/testing/selftests/bpf/test_align.c
> index 471bbbdb94db,fe916d29e166..000000000000
> --- a/tools/testing/selftests/bpf/test_align.c
> +++ b/tools/testing/selftests/bpf/test_align.c
> @@@ -473,8 -473,28 +473,8 @@@ static struct bpf_align_test tests[] =
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> .result = REJECT,
> .matches = {
> - {4, "R5=pkt(id=0,off=0,r=0,imm=0)"},
> + {4, "R5_w=pkt(id=0,off=0,r=0,imm=0)"},
thanks. That's correct resolution.
next prev parent reply other threads:[~2018-01-09 0:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 0:21 linux-next: manual merge of the net-next tree with the bpf tree Stephen Rothwell
2018-01-09 0:29 ` Alexei Starovoitov [this message]
2018-07-26 1:19 Stephen Rothwell
2018-07-26 15:32 ` Martin KaFai Lau
2018-08-01 1:35 Stephen Rothwell
2018-08-01 4:23 ` Yonghong Song
2018-12-03 2:03 Stephen Rothwell
2018-12-03 2:16 Stephen Rothwell
2018-12-14 0:56 Stephen Rothwell
2019-02-20 0:37 Stephen Rothwell
2019-02-20 0:41 ` Alexei Starovoitov
2019-02-20 0:45 ` Stanislav Fomichev
2019-02-20 1:03 ` Stephen Rothwell
2019-02-20 0:48 ` Daniel Borkmann
2019-02-20 3:03 ` Stanislav Fomichev
2019-06-06 1:34 Stephen Rothwell
2020-05-26 3:12 Stephen Rothwell
2020-05-26 5:45 ` Björn Töpel
2020-07-16 1:59 Stephen Rothwell
2021-03-29 1:29 Stephen Rothwell
2021-03-29 8:28 ` Jiri Olsa
2021-04-08 3:02 Stephen Rothwell
2021-04-08 3:11 Stephen Rothwell
2021-06-22 1:06 Stephen Rothwell
2021-10-27 0:12 Stephen Rothwell
2022-09-23 0:45 Stephen Rothwell
2022-10-04 1:24 Stephen Rothwell
2022-10-04 2:07 ` Jakub Kicinski
2022-10-04 22:45 ` Stephen Rothwell
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=20180109002914.447kcn4xqrkdtqql@ast-mbp \
--to=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).