Messages in this thread | | | Date | Mon, 10 Nov 2014 09:58:20 -0800 | From | Josh Triplett <> | Subject | Re: linux-next: manual merge of the tiny tree with Linus' tree |
| |
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
| |