Hi Catalin, Today's linux-next merge of the arm64 tree got a conflict in Documentation/networking/filter.txt between commit 1d7efe9dfaa6 ("Documentation: filter: Add MIPS to architectures with BPF JIT") from the net tree and commit e54bcde3d69d ("arm64: eBPF JIT compiler") from the arm64 tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc Documentation/networking/filter.txt index d16f424c5e8d,1842d4f8ae13..000000000000 --- a/Documentation/networking/filter.txt +++ b/Documentation/networking/filter.txt @@@ -462,9 -462,9 +462,9 @@@ JIT compile ------------ The Linux kernel has a built-in BPF JIT compiler for x86_64, SPARC, PowerPC, - ARM, MIPS and s390 and can be enabled through CONFIG_BPF_JIT. The JIT compiler -ARM, ARM64 and s390 and can be enabled through CONFIG_BPF_JIT. The JIT compiler --is transparently invoked for each attached filter from user space or for --internal kernel users if it has been previously enabled by root: ++ARM, ARM64, MIPS and s390 and can be enabled through CONFIG_BPF_JIT. The JIT ++compiler is transparently invoked for each attached filter from user space or ++for internal kernel users if it has been previously enabled by root: echo 1 > /proc/sys/net/core/bpf_jit_enable
Attachment:
signature.asc
Description: PGP signature