libbpf: Ignore the modules that failed to load BTF object

[kernel-patches-daemon-bpf-rc]

Pull request for series with
subject: libbpf: Ignore the modules that failed to load BTF object
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1016756

[kernel-patches-daemon-bpf-rc]

Upstream branch: 8822409
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1016756
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=1016756
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: libbpf: Ignore the modules that failed to load BTF object
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Patch failed at 0001 libbpf: Ignore the modules that failed to load BTF object'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc tools/lib/bpf/libbpf.c
index dd3b2f57082d,0fa0d89da068..000000000000
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@@ -5762,9 -5700,10 +5762,16 @@@ static int load_module_btfs(struct bpf_
  		btf = btf_get_from_fd(fd, obj->btf_vmlinux);
  		err = libbpf_get_error(btf);
  		if (err) {
++<<<<<<< HEAD
 +			pr_warn("failed to load module [%s]'s BTF object #%d: %s\n",
 +				name, id, errstr(err));
 +			goto err_out;
++=======
+ 			pr_warn("failed to load module [%s]'s BTF object #%d: %d\n",
+ 				name, id, err);
+ 			close(fd);
+ 			continue;
++>>>>>>> libbpf: Ignore the modules that failed to load BTF object
  		}
  
  		err = libbpf_ensure_mem((void **)&obj->btf_modules, &obj->btf_module_cap,

[kernel-patches-daemon-bpf-rc]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1016756 expired. Closing PR.