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).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
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
Attachment:
pgpwe2ERsEq9O.pgp
Description: OpenPGP digital signature
