[pve-devel] r5239 - pve-kernel-2.6.35/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-08 06:24:03 +0000 (Fri, 08 Oct 2010)
New Revision: 5239

Modified:
   pve-kernel-2.6.35/trunk/Makefile
   pve-kernel-2.6.35/trunk/changelog.Debian
   pve-kernel-2.6.35/trunk/config-2.6.35.diff
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2010-10-07 13:48:04 UTC (rev 5238)
+++ pve-kernel-2.6.35/trunk/Makefile	2010-10-08 06:24:03 UTC (rev 5239)
@@ -1,7 +1,7 @@
 RELEASE=1.6
 
 KERNEL_VER=2.6.35
-PKGREL=3
+PKGREL=4
 
 KREL=1
 

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-07 13:48:04 UTC (rev 5238)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-08 06:24:03 UTC (rev 5239)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.35 (2.6.35-4) unstable; urgency=low
+
+  * bug fix: really enable CONFIG_BLK_CGROUP
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 08 Oct 2010 08:17:08 +0200
+
 pve-kernel-2.6.35 (2.6.35-3) unstable; urgency=low
 
   * fix fsync performance: sched-fix.diff

Modified: pve-kernel-2.6.35/trunk/config-2.6.35.diff
===================================================================
--- pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-07 13:48:04 UTC (rev 5238)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-08 06:24:03 UTC (rev 5239)
@@ -1,5 +1,14 @@
---- config-2.6.35.org	2010-10-05 12:07:28.000000000 +0200
-+++ config-2.6.35	2010-10-07 10:25:59.000000000 +0200
+--- config-2.6.35.org	2010-10-08 08:14:42.000000000 +0200
++++ config-2.6.35	2010-10-08 08:15:38.000000000 +0200
+@@ -411,7 +411,7 @@
+ CONFIG_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=m
+ CONFIG_BITREVERSE=y
+-# CONFIG_BLK_CGROUP is not set
++CONFIG_BLK_CGROUP=y
+ CONFIG_BLK_CPQ_CISS_DA=m
+ CONFIG_BLK_CPQ_DA=m
+ CONFIG_BLK_DEV=y
 @@ -928,7 +928,7 @@
  # CONFIG_DEBUG_GPIO is not set
  # CONFIG_DEBUG_HIGHMEM is not set