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
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 17 Nov 2014 16:35:03 +1100
From:	Stephen Rothwell <>
To:	Josh Triplett <>,
	David Miller <>, <>
	Iulia Manda <>,
	Pravin B Shelar <>
Subject: linux-next: manual merge of the tiny tree with the net-next tree

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).

Stephen Rothwell          

diff --cc net/openvswitch/Kconfig
index b7d818c59423,1d979cecd66e..000000000000
--- a/net/openvswitch/Kconfig
+++ b/net/openvswitch/Kconfig
@@@ -4,9 -4,8 +4,10 @@@
  	tristate "Open vSwitch"
 +	depends on INET
  	select LIBCRC32C
 +	select NET_MPLS_GSO
+ 	select FLEX_ARRAY
  	  Open vSwitch is a multilayer Ethernet switch targeted at virtualized
  	  environments.  In addition to supporting a variety of features

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists