[kernel] r12519 - in dists/etch/linux-2.6/debian: . patches/bugfix patches/series

[Dann Frazier]

Author: dannf
Date: Wed Dec 24 17:57:59 2008
New Revision: 12519

Log:
add a couple more smart array pci ids

Added:
   dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/24

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Wed Dec 24 17:57:59 2008
@@ -1,8 +1,8 @@
-linux-2.6 (2.6.18.dfsg.1-24) UNRELEASED; urgency=low
+linux-2.6 (2.6.18.dfsg.1-24) UNRELEASED; urgency=high
 
   [ dann frazier ]
   * cciss: Add support for new hardware (closes: #502553)
-     - Add PCI ids for P700m, P212, P410, P410i, P411, P812
+     - Add PCI ids for P700m, P212, P410, P410i, P411, P812, P711m, p712m
      - Read the FIFO size from the controller config instead of
        hardcoding it into the driver
 
@@ -15,7 +15,7 @@
   * [xen/i386] Fix pseudo hwcap value to match newer kernels.
     (closes: #506420)
 
- -- dann frazier <dannf at debian.org>  Fri, 17 Oct 2008 14:54:31 -0600
+ -- dann frazier <dannf at debian.org>  Tue, 23 Dec 2008 12:24:44 -0700
 
 linux-2.6 (2.6.18.dfsg.1-23) stable; urgency=high
 

Added: dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/bugfix/cciss-p711m,p712m-add-ids.patch	Wed Dec 24 17:57:59 2008
@@ -0,0 +1,48 @@
+commit 77ca7286d10b798e4907af941f29672bf484db77
+Author: Mike Miller <mike.miller at hp.com>
+Date:   Thu Nov 6 12:53:14 2008 -0800
+
+    cciss: new hardware support
+    
+    Add support for 2 new SAS/SATA controllers.
+    
+    Signed-off-by: Mike Miller <mike.miller at hp.com>
+    Cc: Jens Axboe <jens.axboe at oracle.com>
+    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+Adjusted to apply to Debian's 2.6.18 by dann frazier <dannf at debian.org>
+
+diff -urpN a/Documentation/cciss.txt b/Documentation/cciss.txt
+--- a/Documentation/cciss.txt	2008-12-23 12:21:29.000000000 -0700
++++ b/Documentation/cciss.txt	2008-12-23 12:22:54.000000000 -0700
+@@ -26,6 +26,8 @@ This driver is known to work with the fo
+ 	* SA P410i
+ 	* SA P411
+ 	* SA P812
++	* SA P712m
++	* SA P711m
+ 
+ If nodes are not already created in the /dev/cciss directory, run as root:
+ 
+diff -urpN a/drivers/block/cciss.c b/drivers/block/cciss.c
+--- a/drivers/block/cciss.c	2008-12-23 12:21:29.000000000 -0700
++++ b/drivers/block/cciss.c	2008-12-23 12:22:54.000000000 -0700
+@@ -90,6 +90,8 @@ static const struct pci_device_id cciss_
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3247},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324A},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324B},
+ 	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
+ 		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+ 	{0,}
+@@ -127,6 +129,8 @@ static struct board_type products[] = {
+ 	{0x3245103C, "Smart Array P410i", &SA5_access},
+ 	{0x3247103C, "Smart Array P411", &SA5_access},
+ 	{0x3249103C, "Smart Array P812", &SA5_access},
++	{0x324A103C, "Smart Array P712m", &SA5_access},
++	{0x324B103C, "Smart Array P711m", &SA5_access},
+ 	{0xFFFF103C, "Unknown Smart Array", &SA5_access},
+ };
+ 

Modified: dists/etch/linux-2.6/debian/patches/series/24
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/24	(original)
+++ dists/etch/linux-2.6/debian/patches/series/24	Wed Dec 24 17:57:59 2008
@@ -1,3 +1,4 @@
 + bugfix/cciss-p700m.patch
 + bugfix/cciss-new-hardware.patch
 + bugfix/cciss-read-config-to-obtain-max-outstanding-commands-per-controller.patch
++ bugfix/cciss-p711m,p712m-add-ids.patch