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

[Maximilian Attems]

Author: maks
Date: Mon Sep 13 12:37:16 2010
New Revision: 16274

Log:
openvz: disable KSM

Tested-by: Dietmar Maurer <dietmar at proxmox.com>

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	Mon Sep 13 08:14:58 2010	(r16273)
+++ dists/sid/linux-2.6/debian/changelog	Mon Sep 13 12:37:16 2010	(r16274)
@@ -78,6 +78,8 @@
   * [powerpc] Enable WINDFARM_PM121. (closes: #596515)
     Thanks Étienne BERSAC <bersace03 at gmail.com>
   * nouveau: disable acceleration on NVA3/NVA5/NVA8 by default.
+  * openvz: disable KSM. Thanks Dietmar Maurer <dietmar at proxmox.com>.
+    (closes: #585864)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 27 Aug 2010 08:38:26 +0100
 

Modified: dists/sid/linux-2.6/debian/config/featureset-openvz/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/featureset-openvz/config	Mon Sep 13 08:14:58 2010	(r16273)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/config	Mon Sep 13 12:37:16 2010	(r16274)
@@ -29,3 +29,6 @@
 
 # OpenVZ replaces sock_alloc_send_pskb which breaks macvtap
 # CONFIG_MACVTAP is not set
+
+# beancounter breakage
+# CONFIG_KSM is not set