From: Josh Triplett <josh@joshtriplett.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Iulia Manda <iulia.manda21@gmail.com>,
Pravin B Shelar <pshelar@nicira.com>
Subject: Re: linux-next: manual merge of the tiny tree with the net-next tree
Date: Mon, 17 Nov 2014 00:09:19 -0800 [thread overview]
Message-ID: <20141117080919.GD18179@thin> (raw)
In-Reply-To: <20141117163503.6543cd21@canb.auug.org.au>
On Mon, Nov 17, 2014 at 04:35:03PM +1100, Stephen Rothwell wrote:
> Hi Josh,
>
> Today's linux-next merge of the tiny tree got a conflict in
> net/openvswitch/Kconfig between commit 8cd4313aa775 ("openvswitch: Fix
> build failure") from the net-next tree and commit b043d487e255 ("lib:
> Conditionally compile flex_array") from the tiny tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me.
> diff --cc net/openvswitch/Kconfig
> index b7d818c59423,1d979cecd66e..000000000000
> --- a/net/openvswitch/Kconfig
> +++ b/net/openvswitch/Kconfig
> @@@ -4,9 -4,8 +4,10 @@@
>
> config OPENVSWITCH
> tristate "Open vSwitch"
> + depends on INET
> select LIBCRC32C
> + select NET_MPLS_GSO
> + select FLEX_ARRAY
> ---help---
> Open vSwitch is a multilayer Ethernet switch targeted at virtualized
> environments. In addition to supporting a variety of features
next prev parent reply other threads:[~2014-11-17 8:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 5:35 linux-next: manual merge of the tiny tree with the net-next tree Stephen Rothwell
2014-11-17 5:35 ` Stephen Rothwell
2014-11-17 8:09 ` Josh Triplett [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 3:25 Stephen Rothwell
2014-11-10 3:25 ` Stephen Rothwell
2014-11-10 17:56 ` 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=20141117080919.GD18179@thin \
--to=josh@joshtriplett.org \
--cc=davem@davemloft.net \
--cc=iulia.manda21@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pshelar@nicira.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.