linux-next: manual merge of the arm64 tree with the net tree

2014-09-10 Thread Stephen Rothwell
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

linux-next: manual merge of the arm64 tree with the net tree

2014-09-10 Thread Stephen Rothwell
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