fix up queue-6.12/bpf-add-namespace-to-bpf-internal-symbols.patch

diff --git a/queue-6.12/bpf-add-namespace-to-bpf-internal-symbols.patch b/queue-6.12/bpf-add-namespace-to-bpf-internal-symbols.patch
index bcd58c08f40a0d1ec45ed3b72b1945641379e865..62a6cf5200d0ccbf6b8e568d885df3b73d1b543d 100644 (file)
--- a/queue-6.12/bpf-add-namespace-to-bpf-internal-symbols.patch
+++ b/queue-6.12/bpf-add-namespace-to-bpf-internal-symbols.patch
@@ -17,16 +17,14 @@ Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
 Link: https://lore.kernel.org/bpf/20250425014542.62385-1-alexei.starovoitov@gmail.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- Documentation/bpf/bpf_devel_QA.rst    | 8 ++++++++
- kernel/bpf/preload/bpf_preload_kern.c | 1 +
- kernel/bpf/syscall.c                  | 6 +++---
+ Documentation/bpf/bpf_devel_QA.rst    |    8 ++++++++
+ kernel/bpf/preload/bpf_preload_kern.c |    1 +
+ kernel/bpf/syscall.c                  |    6 +++---
  3 files changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/Documentation/bpf/bpf_devel_QA.rst b/Documentation/bpf/bpf_devel_QA.rst
-index de27e1620821c..0acb4c9b8d90f 100644
 --- a/Documentation/bpf/bpf_devel_QA.rst
 +++ b/Documentation/bpf/bpf_devel_QA.rst
-@@ -382,6 +382,14 @@ In case of new BPF instructions, once the changes have been accepted
+@@ -382,6 +382,14 @@ In case of new BPF instructions, once th
  into the Linux kernel, please implement support into LLVM's BPF back
  end. See LLVM_ section below for further information.
  
@@ -41,8 +39,6 @@ index de27e1620821c..0acb4c9b8d90f 100644
  Stable submission
  =================
  
-diff --git a/kernel/bpf/preload/bpf_preload_kern.c b/kernel/bpf/preload/bpf_preload_kern.c
-index 0c63bc2cd895a..56a81df7a9d7c 100644
 --- a/kernel/bpf/preload/bpf_preload_kern.c
 +++ b/kernel/bpf/preload/bpf_preload_kern.c
 @@ -89,4 +89,5 @@ static void __exit fini(void)
@@ -51,8 +47,6 @@ index 0c63bc2cd895a..56a81df7a9d7c 100644
  module_exit(fini);
 +MODULE_IMPORT_NS("BPF_INTERNAL");
  MODULE_LICENSE("GPL");
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 696e5a2cbea2e..b7e6921fb0b9c 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
 @@ -1457,7 +1457,7 @@ struct bpf_map *bpf_map_get(u32 ufd)
@@ -60,28 +54,25 @@ index 696e5a2cbea2e..b7e6921fb0b9c 100644
        return map;
  }
 -EXPORT_SYMBOL(bpf_map_get);
-+EXPORT_SYMBOL_NS(bpf_map_get, "BPF_INTERNAL");
++EXPORT_SYMBOL_NS(bpf_map_get, BPF_INTERNAL);
  
  struct bpf_map *bpf_map_get_with_uref(u32 ufd)
  {
-@@ -3223,7 +3223,7 @@ struct bpf_link *bpf_link_get_from_fd(u32 ufd)
+@@ -3223,7 +3223,7 @@ struct bpf_link *bpf_link_get_from_fd(u3
        bpf_link_inc(link);
        return link;
  }
 -EXPORT_SYMBOL(bpf_link_get_from_fd);
-+EXPORT_SYMBOL_NS(bpf_link_get_from_fd, "BPF_INTERNAL");
++EXPORT_SYMBOL_NS(bpf_link_get_from_fd, BPF_INTERNAL);
  
  static void bpf_tracing_link_release(struct bpf_link *link)
  {
-@@ -5853,7 +5853,7 @@ int kern_sys_bpf(int cmd, union bpf_attr *attr, unsigned int size)
+@@ -5853,7 +5853,7 @@ int kern_sys_bpf(int cmd, union bpf_attr
                return ____bpf_sys_bpf(cmd, attr, size);
        }
  }
 -EXPORT_SYMBOL(kern_sys_bpf);
-+EXPORT_SYMBOL_NS(kern_sys_bpf, "BPF_INTERNAL");
++EXPORT_SYMBOL_NS(kern_sys_bpf, BPF_INTERNAL);
  
  static const struct bpf_func_proto bpf_sys_bpf_proto = {
        .func           = bpf_sys_bpf,
--- 
-2.39.5
-