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

[Maximilian Attems]

Author: maks
Date: Tue Dec 14 07:20:11 2010
New Revision: 16707

Log:
Revert "iptables v6 got fixed in openvz"

report post is not credible.

This reverts commit d59961e40de350b79ec973d831c3805f1341e4e6.

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	Tue Dec 14 03:02:55 2010	(r16706)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 14 07:20:11 2010	(r16707)
@@ -4,9 +4,6 @@
   * NFS: Fix panic after nfs_umount()
   * mpt2sas: Fix incorrect scsi_dma_map error checking (Closes: #606968)
 
-  [ 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	Tue Dec 14 03:02:55 2010	(r16706)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/config	Tue Dec 14 07:20:11 2010	(r16707)
@@ -25,6 +25,9 @@
 # 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