Drop libbpf-add-btf__new_split-api-that-was-declared-but-.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.8/libbpf-add-btf__new_split-api-that-was-declared-but-.patch b/queue-6.8/libbpf-add-btf__new_split-api-that-was-declared-but-.patch
deleted file mode 100644 (file)
index 758d81a..0000000
--- a/queue-6.8/libbpf-add-btf__new_split-api-that-was-declared-but-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 334f0334339f36da511e929ee8f1b89432880ebf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 1 Feb 2024 09:20:25 -0800
-Subject: libbpf: Add btf__new_split() API that was declared but not
- implemented
-
-From: Andrii Nakryiko <andrii@kernel.org>
-
-[ Upstream commit c81a8ab196b5083d5109a51585fcc24fa2055a77 ]
-
-Seems like original commit adding split BTF support intended to add
-btf__new_split() API, and even declared it in libbpf.map, but never
-added (trivial) implementation. Fix this.
-
-Fixes: ba451366bf44 ("libbpf: Implement basic split BTF support")
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Acked-by: Eduard Zingerman <eddyz87@gmail.com>
-Link: https://lore.kernel.org/bpf/20240201172027.604869-4-andrii@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/lib/bpf/btf.c      | 5 +++++
- tools/lib/bpf/libbpf.map | 3 ++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
-index ee95fd379d4d8..b61bc5d1009b7 100644
---- a/tools/lib/bpf/btf.c
-+++ b/tools/lib/bpf/btf.c
-@@ -1079,6 +1079,11 @@ struct btf *btf__new(const void *data, __u32 size)
-       return libbpf_ptr(btf_new(data, size, NULL));
- }
- 
-+struct btf *btf__new_split(const void *data, __u32 size, struct btf *base_btf)
-+{
-+      return libbpf_ptr(btf_new(data, size, base_btf));
-+}
-+
- static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
-                                struct btf_ext **btf_ext)
- {
-diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map
-index d9e1f57534fa7..386964f572a8f 100644
---- a/tools/lib/bpf/libbpf.map
-+++ b/tools/lib/bpf/libbpf.map
-@@ -245,7 +245,6 @@ LIBBPF_0.3.0 {
-               btf__parse_raw_split;
-               btf__parse_split;
-               btf__new_empty_split;
--              btf__new_split;
-               ring_buffer__epoll_fd;
- } LIBBPF_0.2.0;
- 
-@@ -411,5 +410,7 @@ LIBBPF_1.3.0 {
- } LIBBPF_1.2.0;
- 
- LIBBPF_1.4.0 {
-+      global:
-               bpf_token_create;
-+              btf__new_split;
- } LIBBPF_1.3.0;
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 4ba0811df19e1b3187c8f3f34f4f2636ebc9e2be..cc173c3a9b833450edc7b2939c30cfd18f44343f 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -117,7 +117,6 @@ arm64-dts-imx8qm-align-edma3-power-domains-resources.patch
 arm64-dts-imx8qm-correct-edma3-power-domains-and-int.patch
 libbpf-add-missing-libbpf_api-annotation-to-libbpf_s.patch
 libbpf-add-bpf_token_create-api.patch
-libbpf-add-btf__new_split-api-that-was-declared-but-.patch
 libbpf-add-missed-btf_ext__raw_data-api.patch
 wifi-ath9k-delay-all-of-ath9k_wmi_event_tasklet-unti.patch
 wifi-ath11k-change-to-move-wmi_vdev_param_set_hemu_m.patch