From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Josh Triplett <josh@joshtriplett•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Catalina Mocanu <catalina.mocanu@gmail•com>,
Alexei Starovoitov <ast@plumgrid•com>
Subject: linux-next: manual merge of the tiny tree with Linus' tree
Date: Mon, 10 Nov 2014 14:28:03 +1100 [thread overview]
Message-ID: <20141110142803.0dd121b3@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-11-10 3:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 3:28 Stephen Rothwell [this message]
2014-11-10 17:58 ` linux-next: manual merge of the tiny tree with Linus' tree Josh Triplett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141110142803.0dd121b3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@plumgrid$(echo .)com \
--cc=catalina.mocanu@gmail$(echo .)com \
--cc=josh@joshtriplett$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox