From: Andrii Nakryiko <andrii@kernel.org>
Date: Fri, 11 Feb 2022 20:52:35 +0000 (-0800)
Subject: libbpf: Fix libbpf.map inheritance chain for LIBBPF_0.7.0
X-Git-Tag: v5.17.2~586
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7416cbe41329eee689411edfc028fb8d00c7a8f2;p=users%2Fdwmw2%2Flinux.git

libbpf: Fix libbpf.map inheritance chain for LIBBPF_0.7.0

[ Upstream commit d130e954a002b901391037c33b9ae11bae5aaa91 ]

Ensure that LIBBPF_0.7.0 inherits everything from LIBBPF_0.6.0.

Fixes: dbdd2c7f8cec ("libbpf: Add API to get/set log_level at per-program level")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220211205235.2089104-1-andrii@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
index 5297839677930..9a89fdfe4987e 100644
--- a/tools/lib/bpf/libbpf.map
+++ b/tools/lib/bpf/libbpf.map
@@ -431,4 +431,4 @@ LIBBPF_0.7.0 {
 		libbpf_probe_bpf_map_type;
 		libbpf_probe_bpf_prog_type;
 		libbpf_set_memlock_rlim_max;
-};
+} LIBBPF_0.6.0;