linux-kernel - linux-next: manual merge of the tiny tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141110142803.0dd121b3@canb.auug.org.au>
Date:	Mon, 10 Nov 2014 14:28:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Josh Triplett <josh@...htriplett.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Catalina Mocanu <catalina.mocanu@...il.com>,
	Alexei Starovoitov <ast@...mgrid.com>
Subject: linux-next: manual merge of the tiny tree with Linus' tree

Hi Josh,

Today's linux-next merge of the tiny tree got a conflict in net/Kconfig
between commit f89b7755f517 ("bpf: split eBPF out of NET") from Linus'
tree and commit 4ecea0db79ef ("lib: rhashtable: Make rhashtable.c
optional") from the tiny 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 net/Kconfig
index 99815b5454bf,02badd46823f..000000000000
--- a/net/Kconfig
+++ b/net/Kconfig
@@@ -6,7 -6,8 +6,8 @@@ menuconfig NE
  	bool "Networking support"
  	select NLATTR
  	select GENERIC_NET_UTILS
 -	select ANON_INODES
 +	select BPF
+ 	select RHASHTABLE
  	---help---
  	  Unless you really know what you are doing, you should say Y here.
  	  The reason is that some programs need kernel networking support even

Content of type "application/pgp-signature" skipped