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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 17 Nov 2014 00:09:19 -0800 From: Josh Triplett <josh@...htriplett.org> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Iulia Manda <iulia.manda21@...il.com>, Pravin B Shelar <pshelar@...ira.com> Subject: Re: linux-next: manual merge of the tiny tree with the net-next tree 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists