diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2024-12-08 17:01:51 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-12-08 17:01:51 -0800 |
| commit | 442bc81bd344dc52c37d8f80b854cc6da062b2d0 (patch) | |
| tree | 7f91dbeaf9909a5b875c689ca04f1fdb17800b3d /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | selftests/bpf: Consolidate kernel modules into common directory (diff) | |
| parent | Linux 6.13-rc2 (diff) | |
| download | wireguard-linux-442bc81bd344dc52c37d8f80b854cc6da062b2d0.tar.xz wireguard-linux-442bc81bd344dc52c37d8f80b854cc6da062b2d0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Cross-merge bpf fixes after downstream PR.
Trivial conflict:
tools/testing/selftests/bpf/prog_tests/verifier.c
Adjacent changes in:
Auto-merging kernel/bpf/verifier.c
Auto-merging samples/bpf/Makefile
Auto-merging tools/testing/selftests/bpf/.gitignore
Auto-merging tools/testing/selftests/bpf/Makefile
Auto-merging tools/testing/selftests/bpf/prog_tests/verifier.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions