[pve-devel] r5231 - in pve-kernel-2.6.35/trunk: . proxmox-ve

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Oct 7 10:41:11 CEST 2010


Author: dietmar
Date: 2010-10-07 08:41:10 +0000 (Thu, 07 Oct 2010)
New Revision: 5231

Modified:
   pve-kernel-2.6.35/trunk/Makefile
   pve-kernel-2.6.35/trunk/README
   pve-kernel-2.6.35/trunk/changelog.Debian
   pve-kernel-2.6.35/trunk/config-2.6.35.diff
   pve-kernel-2.6.35/trunk/proxmox-ve/changelog.Debian
   pve-kernel-2.6.35/trunk/proxmox-ve/control
Log:


Modified: pve-kernel-2.6.35/trunk/Makefile
===================================================================
--- pve-kernel-2.6.35/trunk/Makefile	2010-10-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/Makefile	2010-10-07 08:41:10 UTC (rev 5231)
@@ -1,7 +1,7 @@
 RELEASE=1.6
 
 KERNEL_VER=2.6.35
-PKGREL=1
+PKGREL=2
 
 KREL=1
 
@@ -11,7 +11,7 @@
 HDRPACKAGE=pve-headers-${KVNAME}
 
 # ubuntu git branch
-UBUNTU_BRANCH=Ubuntu-2.6.35-22.33
+UBUNTU_BRANCH=Ubuntu-2.6.35-22.34
 
 ARCH=amd64
 TOP=$(shell pwd)

Modified: pve-kernel-2.6.35/trunk/README
===================================================================
--- pve-kernel-2.6.35/trunk/README	2010-10-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/README	2010-10-07 08:41:10 UTC (rev 5231)
@@ -50,15 +50,25 @@
   	 CONFIG_HAVE_INTEL_TXT=y
 	 CONFIG_INTEL_TXT=y
 	 CONFIG_DMAR=y
-	 CONFIG_DMAR_DEFAULT_ON=y
 	 CONFIG_PCI_STUB=y
 
+  We do not enable DMAR by default (CONFIG_DMAR_DEFAULT_ON=n), because
+  several users reported problem with that option. You can still
+  eanble it using intel_iommu=on boot option.
+
 - disable CONFIG_DEBUG_INFO
 
 - disable CONFIG_PRINTK_TIME
 
 - set CONFIG_NLS_DEFAULT="iso8859-1"
 
+- disable CONFIG_SCSI_HPSA. Instead we use the old CISS driver
+  (CONFIG_BLK_CPQ_CISS_DA=m, CONFIG_BLK_CPQ_DA=m). Else we have 2
+  modules for the HP SMART ARRAY controller, which use different
+  device naming (/dev/cciss/c*d* vs /dev/sd*). This can lead to race
+  conditions during boot with unexpected device names.
+
+  
 Testing final kernel with kvm
 -----------------------------
 

Modified: pve-kernel-2.6.35/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/changelog.Debian	2010-10-07 08:41:10 UTC (rev 5231)
@@ -1,3 +1,13 @@
+pve-kernel-2.6.35 (2.6.35-2) unstable; urgency=low
+
+  * disable HPSA driver
+  
+  * do not set CONFIG_DMAR_DEFAULT_ON
+
+  * update to Ubuntu-2.6.35-22.34
+  
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 07 Oct 2010 09:35:41 +0200
+
 pve-kernel-2.6.35 (2.6.35-1) stable; urgency=low
 
   * initial release

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-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/config-2.6.35.diff	2010-10-07 08:41:10 UTC (rev 5231)
@@ -1,5 +1,5 @@
---- config-2.6.35.org	2010-10-04 16:01:52.000000000 +0200
-+++ config-2.6.35	2010-10-04 16:02:29.000000000 +0200
+--- 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
 @@ -928,7 +928,7 @@
  # CONFIG_DEBUG_GPIO is not set
  # CONFIG_DEBUG_HIGHMEM is not set
@@ -23,7 +23,7 @@
 +CONFIG_HAVE_INTEL_TXT=y
 +CONFIG_INTEL_TXT=y
 +CONFIG_DMAR=y
-+CONFIG_DMAR_DEFAULT_ON=y
++# CONFIG_DMAR_DEFAULT_ON is not set
  # CONFIG_DMATEST is not set
  # CONFIG_DMA_API_DEBUG is not set
  CONFIG_DMA_ENGINE=y
@@ -54,6 +54,15 @@
  CONFIG_PRISM54=m
  CONFIG_PROC_EVENTS=y
  CONFIG_PROC_FS=y
+@@ -3616,7 +3619,7 @@
+ CONFIG_SCSI_GENERIC_NCR5380=m
+ CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+ CONFIG_SCSI_GENERIC_NCR53C400=y
+-CONFIG_SCSI_HPSA=m
++# CONFIG_SCSI_HPSA is not set
+ CONFIG_SCSI_HPTIOP=m
+ CONFIG_SCSI_IBMMCA=m
+ CONFIG_SCSI_IMM=m
 @@ -5347,12 +5350,12 @@
  #
  # Config options for config.flavour.server automatically generated by splitconfig.pl

Modified: pve-kernel-2.6.35/trunk/proxmox-ve/changelog.Debian
===================================================================
--- pve-kernel-2.6.35/trunk/proxmox-ve/changelog.Debian	2010-10-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/proxmox-ve/changelog.Debian	2010-10-07 08:41:10 UTC (rev 5231)
@@ -1,3 +1,9 @@
+proxmox-ve-2.6.35 (1.6-2) unstable; urgency=low
+
+  * depend on newer firmware 1.0-9
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 07 Oct 2010 08:04:17 +0200
+
 proxmox-ve-2.6.35 (1.6-1) unstable; urgency=low
  
   * depends on latest available 2.6.35 kernel

Modified: pve-kernel-2.6.35/trunk/proxmox-ve/control
===================================================================
--- pve-kernel-2.6.35/trunk/proxmox-ve/control	2010-10-06 07:33:30 UTC (rev 5230)
+++ pve-kernel-2.6.35/trunk/proxmox-ve/control	2010-10-07 08:41:10 UTC (rev 5231)
@@ -6,7 +6,7 @@
 Provides: proxmox-virtual-environment
 Conflicts: proxmox-ve, pve-kernel, proxmox-ve-2.6.18, proxmox-ve-2.6.24, proxmox-ve-2.6.32, proxmox-virtual-environment
 Replaces: proxmox-ve, pve-kernel, proxmox-ve-2.6.18, proxmox-ve-2.6.24, proxmox-ve-2.6.32, proxmox-virtual-environment
-Depends: libc6 (>= 2.7-18), pve-kernel- at KVNAME@, pve-firmware, ksm-control-daemon, pve-manager, qemu-server, pve-qemu-kvm, ssh, apt, vncterm, vzctl, vzdump, vzprocps, vzquota
+Depends: libc6 (>= 2.7-18), pve-kernel- at KVNAME@, pve-firmware (>= 1.0-9), ksm-control-daemon, pve-manager, qemu-server, pve-qemu-kvm, ssh, apt, vncterm, vzctl, vzdump, vzprocps, vzquota
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Description: The Proxmox Virtual Environment
  The Proxmox Virtual Environment is an easy to use Open Source



More information about the pve-devel mailing list