diff options
| author | dann frazier <dannf@debian.org> | 2010-01-26 23:10:37 +0000 |
|---|---|---|
| committer | dann frazier <dannf@debian.org> | 2010-01-26 23:10:37 +0000 |
| commit | fd7685fc629fe00e4553996aad34d6eb0f4d509f (patch) | |
| tree | 860a6938e4068c97fe4b4b25f1eafbeececaaa4c | |
| parent | cfe445f5bb2aafc510fb699c24a951e9ebb47de2 (diff) | |
| download | kernel_replicant_linux-fd7685fc629fe00e4553996aad34d6eb0f4d509f.tar.gz kernel_replicant_linux-fd7685fc629fe00e4553996aad34d6eb0f4d509f.tar.bz2 kernel_replicant_linux-fd7685fc629fe00e4553996aad34d6eb0f4d509f.zip | |
[vserver] explicitly disable CFS_HARD_LIMITS
svn path=/dists/trunk/linux-2.6/; revision=15023
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/featureset-vserver/config | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 11bb356cca54..6f25112f0fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,9 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low * 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@decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000 linux-2.6 (2.6.32-5) unstable; urgency=low diff --git a/debian/config/featureset-vserver/config b/debian/config/featureset-vserver/config index 98eb26308089..bc74999b2d08 100644 --- a/debian/config/featureset-vserver/config +++ b/debian/config/featureset-vserver/config @@ -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 |