diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-02-20 18:10:24 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-02-20 18:13:57 -0800 |
| commit | bd4319b6c2b36aa5c6534aec1dbe16921ec960ef (patch) | |
| tree | aec6748a7c59ea9a3ebb2c543b2e7f0ce2806b91 /scripts/module.lds.S | |
| parent | selftests/bpf: Add tests for bpf_copy_from_user_task_str (diff) | |
| parent | Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (diff) | |
| download | linux-bd4319b6c2b36aa5c6534aec1dbe16921ec960ef.tar.gz linux-bd4319b6c2b36aa5c6534aec1dbe16921ec960ef.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4
Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4).
Minor conflict:
kernel/bpf/btf.c
Adjacent changes:
kernel/bpf/arena.c
kernel/bpf/btf.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
mm/memory.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'scripts/module.lds.S')
| -rw-r--r-- | scripts/module.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/module.lds.S b/scripts/module.lds.S index c2f80f9141d4..450f1088d5fd 100644 --- a/scripts/module.lds.S +++ b/scripts/module.lds.S @@ -16,6 +16,7 @@ SECTIONS { *(.discard) *(.discard.*) *(.export_symbol) + *(.no_trim_symbol) } __ksymtab 0 : ALIGN(8) { *(SORT(___ksymtab+*)) } |