From ac2b5f6cbf24455fb1827f6001b286aeef0a2660 Mon Sep 17 00:00:00 2001 From: calm329 Date: Mon, 12 Jan 2026 10:20:22 -0800 Subject: [PATCH] basic: move BPF_JMP_A to override/linux/bpf_insn.h Move the BPF_JMP_A macro from override/linux/bpf.h to override/linux/bpf_insn.h. The bpf.h override conflicts with libbpf's -I/usr/include/bpf/uapi include path. Since bpf_insn.h is not typically installed at /usr/include/linux/ or /usr/include/bpf/uapi/linux/, the override works without conflicts. Fixes #40331 --- src/include/override/linux/{bpf.h => bpf_insn.h} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/include/override/linux/{bpf.h => bpf_insn.h} (89%) diff --git a/src/include/override/linux/bpf.h b/src/include/override/linux/bpf_insn.h similarity index 89% rename from src/include/override/linux/bpf.h rename to src/include/override/linux/bpf_insn.h index f33c748fde..501af52670 100644 --- a/src/include/override/linux/bpf.h +++ b/src/include/override/linux/bpf_insn.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next /* IWYU pragma: export */ +#include_next /* IWYU pragma: export */ /* defined in linux/filter.h */ /* Unconditional jumps, goto pc + off16 */