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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20140911121621.4946da46@canb.auug.org.au>
Date:	Thu, 11 Sep 2014 12:16:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Catalin Marinas <catalin.marinas@....com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Zi Shen Lim <zlim.lnx@...il.com>,
	Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the arm64 tree with the net tree

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@...b.auug.org.au

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
  

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)