diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-11-15 04:43:41 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-11-15 04:43:41 +0300 |
| commit | e47b68bda4de6a848a8b6c79316542326a8fb3ca (patch) | |
| tree | bb1300a3177f5c92e2698fab42178f160f41316e /scripts/patch-kernel | |
| parent | ef2c0b2e56ad710a2b5a85b678a6c685756e03a4 (diff) | |
| parent | 7a0892d2836e12cc61b6823f888629a3eb64e268 (diff) | |
| download | linux-e47b68bda4de6a848a8b6c79316542326a8fb3ca.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+
Cross-merge BPF and other fixes after downstream PR.
Minor conflict in kernel/bpf/helpers.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions