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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-25 11:13:43 +0100 (Fri, 25 Feb 2011)
New Revision: 5627

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:
updates


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2011-02-25 07:58:45 UTC (rev 5626)
+++ pve-kernel-2.6.35/trunk/Makefile	2011-02-25 10:13:43 UTC (rev 5627)
@@ -1,7 +1,7 @@
 RELEASE=1.7
 
 KERNEL_VER=2.6.35
-PKGREL=9
+PKGREL=10
 
 KREL=1
 
@@ -11,7 +11,7 @@
 HDRPACKAGE=pve-headers-${KVNAME}
 
 # ubuntu git branch
-UBUNTU_BRANCH=Ubuntu-2.6.35-24.42
+UBUNTU_BRANCH=Ubuntu-2.6.35-27.48
 
 ARCH=amd64
 TOP=$(shell pwd)

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2011-02-25 07:58:45 UTC (rev 5626)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2011-02-25 10:13:43 UTC (rev 5627)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.35 (2.6.35-10) unstable; urgency=low
+
+  * update to Ubuntu-2.6.35-27.48
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 25 Feb 2011 10:39:42 +0100
+
 pve-kernel-2.6.35 (2.6.35-9) unstable; urgency=low
 
   *  update to Ubuntu-2.6.35-24.42

Modified: pve-kernel-2.6.35/trunk/config-2.6.35.diff
===================================================================
--- pve-kernel-2.6.35/trunk/config-2.6.35.diff	2011-02-25 07:58:45 UTC (rev 5626)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2011-02-25 10:13:43 UTC (rev 5627)
@@ -1,5 +1,5 @@
---- config-2.6.35.org	2010-12-16 05:44:55.000000000 +0100
-+++ config-2.6.35	2010-12-16 05:47:12.000000000 +0100
+--- config-2.6.35.org	2011-02-25 11:06:55.000000000 +0100
++++ config-2.6.35	2011-02-25 11:10:56.000000000 +0100
 @@ -411,7 +411,8 @@
  CONFIG_BINFMT_ELF=y
  CONFIG_BINFMT_MISC=m
@@ -106,7 +106,7 @@
  CONFIG_SECURITY_NETWORK=y
  # CONFIG_SECURITY_NETWORK_XFRM is not set
  CONFIG_SECURITY_PATH=y
-@@ -5072,7 +5075,7 @@
+@@ -5071,7 +5074,7 @@
  CONFIG_B43LEGACY=m
  CONFIG_B44=m
  CONFIG_BT=m
@@ -115,7 +115,7 @@
  CONFIG_CDROM_PKTCDVD=y
  CONFIG_CEPH_FS=m
  CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-@@ -5347,13 +5350,13 @@
+@@ -5345,14 +5348,14 @@
  #
  # Config options for config.flavour.server automatically generated by splitconfig.pl
  #
@@ -127,6 +127,7 @@
 +CONFIG_DEFAULT_IOSCHED="cfq"
  CONFIG_INTEL_IDLE=y
  CONFIG_MEMORY_HOTPLUG=y
+ CONFIG_NR_CPUS=256
 -CONFIG_PREEMPT_NONE=y
 -# CONFIG_PREEMPT_VOLUNTARY is not set
 +# CONFIG_PREEMPT_NONE is not set
@@ -135,8 +136,8 @@
  CONFIG_SCSI_SYM53C8XX_2=y
  CONFIG_VIRTIO=y
 @@ -5363,3 +5366,7 @@
- CONFIG_VIRTIO_RING=y
  CONFIG_XEN_BLKDEV_FRONTEND=m
+ CONFIG_XEN_MAX_DOMAIN_MEMORY=32
  CONFIG_XEN_NETDEV_FRONTEND=m
 +# Bootsplash
 +CONFIG_BOOTSPLASH=y