diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 19:34:37 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 19:34:37 +0300 |
| commit | 5d87e96a4971760c83e554c1d3ca99986d4f9b47 (patch) | |
| tree | 6623b8ed550fd713e09fd2466bfcafa2f3a6a393 /tools/testing/shared/linux | |
| parent | f85981327a90c51e76f60e073cb6648b2f167226 (diff) | |
| parent | e59a039119c3ec241228adf12dca0dd4398104d0 (diff) | |
| download | linux-5d87e96a4971760c83e554c1d3ca99986d4f9b47.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc5
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/shared/linux')
| -rw-r--r-- | tools/testing/shared/linux/idr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/shared/linux/idr.h b/tools/testing/shared/linux/idr.h index 4e342f2e37cf..676c5564e33f 100644 --- a/tools/testing/shared/linux/idr.h +++ b/tools/testing/shared/linux/idr.h @@ -1 +1,5 @@ +/* Avoid duplicate definitions due to system headers. */ +#ifdef __CONCAT +#undef __CONCAT +#endif #include "../../../../include/linux/idr.h" |