[kernel] r16713 - in dists/sid/linux-2.6/debian: . config/featureset-openvz

[Maximilian Attems]

Author: maks
Date: Sun Dec 19 21:56:03 2010
New Revision: 16713

Log:
Revert "Revert "iptables v6 got fixed in openvz""

aka reinstate NF_CONNTRACK_IPV6 for openvz, ml post has details.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/featureset-openvz/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Dec 18 05:02:37 2010	(r16712)
+++ dists/sid/linux-2.6/debian/changelog	Sun Dec 19 21:56:03 2010	(r16713)
@@ -13,6 +13,9 @@
     (Closes: #607284)
   * tehuti: Firmware filename is tehuti/bdx.bin
 
+  [ maximilian attems ]
+  * [openvz] Reenable NF_CONNTRACK_IPV6.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 
 linux-2.6 (2.6.32-29) unstable; urgency=high

Modified: dists/sid/linux-2.6/debian/config/featureset-openvz/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/featureset-openvz/config	Sat Dec 18 05:02:37 2010	(r16712)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/config	Sun Dec 19 21:56:03 2010	(r16713)
@@ -25,9 +25,6 @@
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_SYSFS_DEPRECATED_DYN is not set
 
-# buggy
-# CONFIG_NF_CONNTRACK_IPV6 is not set
-
 # OpenVZ replaces sock_alloc_send_pskb which breaks macvtap
 # CONFIG_MACVTAP is not set