Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
tools/lib/bpf/libbpf.c
between commit:
1e891e513e16 ("libbpf: Fix map index used in error message")
from Linus' tree and commit:
88a82120282b ("libbpf: Factor out common ELF operations and improve logging")
from t
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
tools/testing/selftests/bpf/test_verifier.c
between commits:
7640ead93924 ("bpf: verifier: make sure callees don't prune with caller
differences")
14507e35bd9d ("selftests: bpf: verifier: add tests for JSET interpre
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
arch/x86/lib/Makefile
between commit:
76b043848fd2 ("x86/retpoline: Add initial retpoline support")
from Linus' tree and commit:
540adea3809f ("error-injection: Separate error-injection from kprobe")
from the bpf-
