* linux-next: manual merge of the tiny tree with Linus' tree
@ 2014-11-10 3:28 Stephen Rothwell
2014-11-10 17:58 ` Josh Triplett
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-10 3:28 UTC (permalink / raw)
To: Josh Triplett
Cc: linux-next, linux-kernel, Catalina Mocanu, Alexei Starovoitov
[-- Attachment #1: Type: text/plain, Size: 867 bytes --]
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@canb.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the tiny tree with Linus' tree
2014-11-10 3:28 linux-next: manual merge of the tiny tree with Linus' tree Stephen Rothwell
@ 2014-11-10 17:58 ` Josh Triplett
0 siblings, 0 replies; 2+ messages in thread
From: Josh Triplett @ 2014-11-10 17:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Catalina Mocanu, Alexei Starovoitov
On Mon, Nov 10, 2014 at 02:28:03PM +1100, Stephen Rothwell wrote:
> 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).
This resolution looks correct to me.
- Josh Triplett
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-10 17:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-10 3:28 linux-next: manual merge of the tiny tree with Linus' tree Stephen Rothwell
2014-11-10 17:58 ` Josh Triplett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).