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

Commit Message

Mark Brown Dec. 10, 2021, 12:43 p.m. UTC

Hi all,

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

  tools/lib/bpf/libbpf.c

between commit:

  ba05fd36b8512 ("libbpf: Perform map fd cleanup for gen_loader in case of error")

from the netdev tree and commit:

  fa5e5cc04e443 ("libbpf: Deprecate bpf_object__load_xattr()")

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.

+++ b/tools/lib/bpf/libbpf.c
@@@ -7263,7 -7475,7 +7475,7 @@@ static int bpf_object_load(struct bpf_o
  	}
  
  	if (obj->gen_loader)
- 		bpf_gen__init(obj->gen_loader, attr->log_level, obj->nr_programs, obj->nr_maps);
 -		bpf_gen__init(obj->gen_loader, extra_log_level);
++		bpf_gen__init(obj->gen_loader, extra_log_level, obj->nr_programs, obj->nr_maps);
  
  	err = bpf_object__probe_loading(obj);
  	err = err ? : bpf_object__load_vmlinux_btf(obj, false);

Patch

diff --cc tools/lib/bpf/libbpf.c
index f6faa33c80fa7,18d95c6a89fe3..0000000000000
--- a/tools/lib/bpf/libbpf.c