[kernel] r15023 - in dists/trunk/linux-2.6/debian: . config/featureset-vserver

[Dann Frazier]

Author: dannf
Date: Tue Jan 26 23:10:37 2010
New Revision: 15023

Log:
[vserver] explicitly disable CFS_HARD_LIMITS

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/featureset-vserver/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jan 26 23:06:49 2010	(r15022)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jan 26 23:10:37 2010	(r15023)
@@ -71,6 +71,9 @@
   * Pass `DEB_MAINT_PARAMS' to hook scripts. (closes: #563161)
   * Enable more mobile IPv6 needs. (closes: #528834)
 
+  [ dann frazier ]
+  * [vserver] explicitly disable CFS_HARD_LIMITS
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 10 Jan 2010 17:38:50 +0000
 
 linux-2.6 (2.6.32-5) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/featureset-vserver/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/featureset-vserver/config	Tue Jan 26 23:06:49 2010	(r15022)
+++ dists/trunk/linux-2.6/debian/config/featureset-vserver/config	Tue Jan 26 23:10:37 2010	(r15023)
@@ -4,6 +4,11 @@
 CONFIG_BLK_DEV_VROOT=y
 
 ##
+## file: init/Kconfig
+##
+# CONFIG_CFS_HARD_LIMITS is not set
+
+##
 ## file: kernel/vserver/Kconfig
 ##
 CONFIG_VSERVER_AUTO_LBACK=y