[pve-devel] r6099 - pve-kernel-2.6.32/pve2

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 17 07:36:09 CEST 2011 

Author: dietmar
Date: 2011-06-17 07:36:09 +0200 (Fri, 17 Jun 2011)
New Revision: 6099

Modified:
   pve-kernel-2.6.32/pve2/applydebpatches.pl
   pve-kernel-2.6.32/pve2/changelog.Debian
   pve-kernel-2.6.32/pve2/config-2.6.32.diff
Log:


Modified: pve-kernel-2.6.32/pve2/applydebpatches.pl
===================================================================
--- pve-kernel-2.6.32/pve2/applydebpatches.pl	2011-06-17 04:50:27 UTC (rev 6098)
+++ pve-kernel-2.6.32/pve2/applydebpatches.pl	2011-06-17 05:36:09 UTC (rev 6099)
@@ -69,6 +69,7 @@
 
 foreach my $rev (@revisions) {
     try_apply_series("$base/series/$rev");
+    try_apply_series("$base/series/${rev}squeeze1");
 }
 
 foreach my $rev (@revisions) {

Modified: pve-kernel-2.6.32/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-17 04:50:27 UTC (rev 6098)
+++ pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-17 05:36:09 UTC (rev 6099)
@@ -6,6 +6,14 @@
   
   * enable CONFIG_SENSORS_K10TEMP=m
 
+  * enable HP Smart Array SCSI driver SCSI_HPSA=m
+  
+  * enable PMC-Sierra SPC 8001 SAS/SATA SCSI_PM8001=m
+  
+  * enbale Brocade 1010/1020 10Gb Ethernet BNA=m
+  
+  * fix applydebpatches.pl: include ${rev}squeeze1 series patches
+  
  -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Jun 2011 06:45:42 +0200
 
 pve-kernel-2.6.32 (2.6.32-30) unstable; urgency=low

Modified: pve-kernel-2.6.32/pve2/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/pve2/config-2.6.32.diff	2011-06-17 04:50:27 UTC (rev 6098)
+++ pve-kernel-2.6.32/pve2/config-2.6.32.diff	2011-06-17 05:36:09 UTC (rev 6099)
@@ -1,12 +1,12 @@
---- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
-+++ config-2.6.32	2011-03-29 08:49:43.000000000 +0200
+--- config-2.6.32.org	2010-12-20 08:31:24.000000000 +0100
++++ config-2.6.32	2011-06-17 07:34:58.000000000 +0200
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.32
 -# Tue Oct 19 23:25:36 2010
 +# Linux kernel version: 2.6.32-4-pve
-+# Tue Mar 29 08:49:17 2011
++# Fri Jun 17 07:32:43 2011
  #
  CONFIG_64BIT=y
  # CONFIG_X86_32 is not set
@@ -70,7 +70,15 @@
  CONFIG_CHR_DEV_SCH=m
  CONFIG_SCSI_ENCLOSURE=m
  CONFIG_SCSI_MULTI_LUN=y
-@@ -1558,6 +1559,7 @@
+@@ -1523,6 +1524,7 @@
+ CONFIG_SCSI_BNX2_ISCSI=m
+ CONFIG_BE2ISCSI=m
+ CONFIG_BLK_DEV_3W_XXXX_RAID=m
++CONFIG_SCSI_HPSA=m
+ CONFIG_SCSI_3W_9XXX=m
+ CONFIG_SCSI_3W_SAS=m
+ CONFIG_SCSI_ACARD=m
+@@ -1558,6 +1560,7 @@
  # CONFIG_SCSI_MPT2SAS_LOGGING is not set
  CONFIG_SCSI_HPTIOP=m
  CONFIG_SCSI_BUSLOGIC=m
@@ -78,7 +86,15 @@
  CONFIG_LIBFC=m
  CONFIG_LIBFCOE=m
  CONFIG_FCOE=m
-@@ -1686,7 +1688,7 @@
+@@ -1594,6 +1597,7 @@
+ CONFIG_SCSI_DC390T=m
+ CONFIG_SCSI_DEBUG=m
+ CONFIG_SCSI_PMCRAID=m
++CONFIG_SCSI_PM8001=m
+ CONFIG_SCSI_SRP=m
+ CONFIG_SCSI_BFA_FC=m
+ CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+@@ -1686,7 +1690,7 @@
  # CONFIG_ASYNC_RAID6_TEST is not set
  CONFIG_MD_MULTIPATH=m
  CONFIG_MD_FAULTY=m
@@ -87,15 +103,17 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -1895,6 +1897,7 @@
+@@ -1895,7 +1899,9 @@
  CONFIG_MLX4_DEBUG=y
  CONFIG_TEHUTI=m
  CONFIG_BNX2X=m
 +CONFIG_QLCNIC=m
  CONFIG_QLGE=m
++CONFIG_BNA=m
  CONFIG_SFC=m
  CONFIG_SFC_MTD=y
-@@ -2698,6 +2701,7 @@
+ CONFIG_BE2NET=m
+@@ -2698,6 +2704,7 @@
  CONFIG_SENSORS_ADT7473=m
  CONFIG_SENSORS_ADT7475=m
  CONFIG_SENSORS_K8TEMP=m
@@ -103,7 +121,7 @@
  CONFIG_SENSORS_ASB100=m
  CONFIG_SENSORS_ATXP1=m
  CONFIG_SENSORS_DS1621=m
-@@ -2780,6 +2784,7 @@
+@@ -2780,6 +2787,7 @@
  CONFIG_ADVANTECH_WDT=m
  CONFIG_ALIM1535_WDT=m
  CONFIG_ALIM7101_WDT=m
@@ -111,7 +129,7 @@
  CONFIG_SC520_WDT=m
  CONFIG_SBC_FITPC2_WATCHDOG=m
  CONFIG_EUROTECH_WDT=m
-@@ -3392,6 +3397,11 @@
+@@ -3392,6 +3400,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -123,7 +141,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4008,6 +4018,7 @@
+@@ -4008,6 +4021,7 @@
  # CONFIG_POCH is not set
  CONFIG_BRCM80211=m
  CONFIG_BRCM80211_PCI=y
@@ -131,7 +149,7 @@
  CONFIG_RT2860=m
  CONFIG_RT2870=m
  CONFIG_COMEDI=m
-@@ -4442,7 +4453,7 @@
+@@ -4442,7 +4456,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -140,7 +158,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4479,7 +4490,7 @@
+@@ -4479,7 +4493,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -149,7 +167,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4578,7 +4589,7 @@
+@@ -4578,7 +4592,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -158,7 +176,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4722,7 +4733,7 @@
+@@ -4722,7 +4736,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m

More information about the pve-devel mailing list