Merge "bpf_headers: add DEFINE_BPF_RINGBUF macro" into main