[kernel] r22156 - in dists/trunk/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 05:45:04 2014
New Revision: 22156

Log:
net: Enable GENEVE as module; enable OPENVSWITCH_GENEVE

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  9 05:40:14 2014	(r22155)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 05:45:04 2014	(r22156)
@@ -9,6 +9,7 @@
     with wheezy's udev package
   * net: Enable 6LOWPAN as module; re-enable BT_6LOWPAN and
     IEEE802154_6LOWPAN as modules
+  * net: Enable GENEVE as module; enable OPENVSWITCH_GENEVE
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Dec  9 05:40:14 2014	(r22155)
+++ dists/trunk/linux/debian/config/config	Tue Dec  9 05:45:04 2014	(r22156)
@@ -5629,6 +5629,7 @@
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
+CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -5992,6 +5993,7 @@
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_OPENVSWITCH_GENEVE=y
 
 ##
 ## file: net/packet/Kconfig