Merge "bpf: merge block.c into netd.c" into main