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

[Maximilian Attems]

Author: maks
Date: Mon Oct 13 15:02:22 2008
New Revision: 12305

Log:
openvz unset NF_CONNTRACK_IPV6 for now until abi bump

oopses on load, fixed in newer patch that needs abi bump

ignore resulting abi changes on enabled openvz images

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Oct 13 15:02:22 2008
@@ -77,6 +77,7 @@
   [ maximilian attems ]
   * [openvz] ip: NULL pointer dereferrence in tcp_v(4|6)_send_ack
     (closes: #500472)
+  * [openvz] unset NF_CONNTRACK_IPV6 for now until abi bump.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 09 Oct 2008 15:14:50 +0200
 

Modified: dists/sid/linux-2.6/debian/config/amd64/openvz/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/openvz/defines	(original)
+++ dists/sid/linux-2.6/debian/config/amd64/openvz/defines	Mon Oct 13 15:02:22 2008
@@ -2,3 +2,11 @@
 flavours:
  amd64
 
+[abi]
+ignore-changes:
+ fini_nf_ct_l3proto_ipv6
+ init_nf_ct_l3proto_ipv6
+ nf_ct_proto_icmpv6_sysctl_cleanup
+ nf_ct_proto_icmpv6_sysctl_init
+ pnp_rtc_missing
+

Modified: dists/sid/linux-2.6/debian/config/featureset-openvz/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/featureset-openvz/config	(original)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/config	Mon Oct 13 15:02:22 2008
@@ -19,3 +19,6 @@
 CONFIG_BC_SWAP_ACCOUNTING=y
 CONFIG_BC_PROC=y
 # CONFIG_BC_DEBUG is not set
+
+# buggy
+# CONFIG_NF_CONNTRACK_IPV6 is not set

Modified: dists/sid/linux-2.6/debian/config/i386/openvz/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/openvz/defines	(original)
+++ dists/sid/linux-2.6/debian/config/i386/openvz/defines	Mon Oct 13 15:02:22 2008
@@ -2,6 +2,14 @@
 flavours:
  686
 
+[abi]
+ignore-changes:
+ fini_nf_ct_l3proto_ipv6
+ init_nf_ct_l3proto_ipv6
+ nf_ct_proto_icmpv6_sysctl_cleanup
+ nf_ct_proto_icmpv6_sysctl_init
+ pnp_rtc_missing
+
 [686_image]
 configs:
   i386/config.686-bigmem