From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>,
David Miller <davem@davemloft.net>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Benjamin Poirier <bpoirier@suse.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree
Date: Wed, 24 Apr 2019 13:12:40 +1000 [thread overview]
Message-ID: <20190424131240.765178fa@canb.auug.org.au> (raw)
In-Reply-To: <20190417110856.54b4ac1c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]
Hi all,
On Wed, 17 Apr 2019 11:08:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> tools/bpf/bpftool/map.c
>
> between commit:
>
> e0665239e07f ("bpftool: Fix errno variable usage")
>
> from the bpf tree and commit:
>
> 0478c3bf8124 ("bpftool: Use print_entry_error() in case of ENOENT when dumping")
>
> from the bpf-next tree.
>
> diff --cc tools/bpf/bpftool/map.c
> index 1744bf61a0b8,44b192e87708..000000000000
> --- a/tools/bpf/bpftool/map.c
> +++ b/tools/bpf/bpftool/map.c
> @@@ -722,11 -715,16 +715,16 @@@ static int dump_map_elem(int fd, void *
> jsonw_string_field(json_wtr, "error", strerror(lookup_errno));
> jsonw_end_object(json_wtr);
> } else {
> + const char *msg = NULL;
> +
> - if (errno == ENOENT)
> + if (lookup_errno == ENOENT)
> - print_entry_plain(map_info, key, NULL);
> - else
> - print_entry_error(map_info, key,
> - strerror(lookup_errno));
> + msg = "<no entry>";
> + else if (lookup_errno == ENOSPC &&
> + map_info->type == BPF_MAP_TYPE_REUSEPORT_SOCKARRAY)
> + msg = "<cannot read>";
> +
> + print_entry_error(map_info, key,
> + msg ? : strerror(lookup_errno));
> }
>
> return 0;
This is now a conflict between the net-next and bpf trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-04-24 3:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 1:08 linux-next: manual merge of the bpf-next tree with the bpf tree Stephen Rothwell
2019-04-24 3:12 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 1:40 Stephen Rothwell
2023-03-06 22:58 Stephen Rothwell
2023-03-10 0:38 ` Stephen Rothwell
2023-03-10 3:18 ` Bagas Sanjaya
2022-11-21 1:27 Stephen Rothwell
2022-08-26 1:46 Stephen Rothwell
2022-08-25 0:50 Stephen Rothwell
2022-08-22 1:01 Stephen Rothwell
2021-12-05 23:39 Stephen Rothwell
2020-09-30 4:07 Stephen Rothwell
2020-10-02 3:59 ` Stephen Rothwell
2020-06-26 0:05 Stephen Rothwell
2020-07-06 1:43 ` Stephen Rothwell
2020-05-15 3:18 Stephen Rothwell
2019-10-08 22:47 Stephen Rothwell
2019-10-15 23:29 ` Stephen Rothwell
2019-10-07 22:48 Stephen Rothwell
2019-10-15 23:27 ` Stephen Rothwell
2018-12-04 1:09 Stephen Rothwell
2018-12-04 1:05 Stephen Rothwell
2018-11-12 0:54 Stephen Rothwell
2018-05-14 1:57 Stephen Rothwell
2018-05-14 20:41 ` Jakub Kicinski
2018-05-14 21:57 ` Stephen Rothwell
2018-05-02 2:09 Stephen Rothwell
2018-05-02 4:40 ` Song Liu
2018-05-02 5:50 ` Stephen Rothwell
2018-05-02 6:05 ` Song Liu
2018-04-26 0:53 Stephen Rothwell
2018-04-26 7:57 ` Daniel Borkmann
2018-02-26 0:41 Stephen Rothwell
2018-02-26 9:03 ` Daniel Borkmann
2018-02-26 23:28 ` 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=20190424131240.765178fa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ast@kernel.org \
--cc=bpoirier@suse.com \
--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 \
/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).