linux-next: manual merge of the bpf-next tree with the bpf tree

From: Stephen Rothwell
Date: Tue Apr 16 2019 - 21:09:23 EST

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:


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.

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.

Stephen Rothwell

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));
} 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 &&
+ msg = "<cannot read>";
+ print_entry_error(map_info, key,
+ msg ? : strerror(lookup_errno));

return 0;

Attachment: pgpLylnpT4z0A.pgp
Description: OpenPGP digital signature