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

[Stephen Rothwell]

Hi all,

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

  tools/bpf/bpftool/map.c

between commit:

  573b3aa69406 ("tools/bpftool: fix a percpu_array map dump problem")

from the bpf tree and commit:

  2d3feca8c44f ("bpf: btf: print map dump and lookup with btf info")

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/bpf/bpftool/map.c
index f74a8bcbda87,9c8191845585..000000000000
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@@ -34,9 -34,7 +34,8 @@@
  #include <assert.h>
  #include <errno.h>
  #include <fcntl.h>
 +#include <linux/kernel.h>
+ #include <linux/err.h>
  #include <stdbool.h>
  #include <stdio.h>
  #include <stdlib.h>
@@@ -162,11 -262,20 +264,21 @@@ static void print_entry_json(struct bpf
  		print_hex_data_json(key, info->key_size);
  		jsonw_name(json_wtr, "value");
  		print_hex_data_json(value, info->value_size);
+ 		if (btf) {
+ 			struct btf_dumper d = {
+ 				.btf = btf,
+ 				.jw = json_wtr,
+ 				.is_plain_text = false,
+ 			};
+ 
+ 			jsonw_name(json_wtr, "formatted");
+ 			do_dump_btf(&d, info, key, value);
+ 		}
  	} else {
 -		unsigned int i, n;
 +		unsigned int i, n, step;
  
  		n = get_possible_cpus();
 +		step = round_up(info->value_size, 8);
  
  		jsonw_name(json_wtr, "key");
  		print_hex_data_json(key, info->key_size);

Attachment: pgpffX6m05P2i.pgp
Description: OpenPGP digital signature