Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Rejecting non-native endian BTF overlapped with the addition of support for it. The rest were more simple overlapping changes, except the renesas ravb binding update, which had to follow a file move as well as a YAML conversion. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -8071,7 +8071,7 @@ static const struct bpf_sec_def section_defs[] = {
|
||||
BPF_XDP_DEVMAP),
|
||||
BPF_EAPROG_SEC("xdp_cpumap/", BPF_PROG_TYPE_XDP,
|
||||
BPF_XDP_CPUMAP),
|
||||
BPF_EAPROG_SEC("xdp", BPF_PROG_TYPE_XDP,
|
||||
BPF_APROG_SEC("xdp", BPF_PROG_TYPE_XDP,
|
||||
BPF_XDP),
|
||||
BPF_PROG_SEC("perf_event", BPF_PROG_TYPE_PERF_EVENT),
|
||||
BPF_PROG_SEC("lwt_in", BPF_PROG_TYPE_LWT_IN),
|
||||
|
Reference in New Issue
Block a user