r4239 - in dists/sid/linux-2.6/debian: . patches-debian patches-debian/series

[Simon Horman]

Author: horms
Date: 2005-09-21 03:41:40 +0000 (Wed, 21 Sep 2005)
New Revision: 4239

Removed:
   dists/sid/linux-2.6/debian/patches-debian/aacraid-bad-BUG_ON-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7
Log:
Remove aacraid-bad-BUG_ON-fix.patch, as it fixes a problem introduced with variable fib size support introduced between 2.6.12 and 2.6.13 (linus' git tree 7c00ffa314bf0fb0e23858bbebad33b48b6abbb9)

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-09-20 10:11:13 UTC (rev 4238)
+++ dists/sid/linux-2.6/debian/changelog	2005-09-21 03:41:40 UTC (rev 4239)
@@ -20,8 +20,6 @@
   * Added 2.6.13.1
     - Kconfig: saa7134-dvb must select tda1004x
       saa7134-dvb-must-select-tda1004x.patch
-    - aacraid bad BUG_ON fix
-      aacraid-bad-BUG_ON-fix.patch
     - Fix PCI ROM mapping
       fix-pci-rom-mapping.patch
     - 2.6.13 breaks libpcap (and tcpdump)
@@ -59,7 +57,7 @@
     - USB: ftdi_sio: custom baud rate fix
       usb-ftdi_sio-baud-fix.patch
 
- -- Simon Horman <horms at debian.org>  Tue, 20 Sep 2005 19:09:28 +0900
+ -- Simon Horman <horms at debian.org>  Wed, 21 Sep 2005 12:39:59 +0900
 
 linux-2.6 (2.6.12-6) unstable; urgency=high
 

Deleted: dists/sid/linux-2.6/debian/patches-debian/aacraid-bad-BUG_ON-fix.patch
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/aacraid-bad-BUG_ON-fix.patch	2005-09-20 10:11:13 UTC (rev 4238)
+++ dists/sid/linux-2.6/debian/patches-debian/aacraid-bad-BUG_ON-fix.patch	2005-09-21 03:41:40 UTC (rev 4239)
@@ -1,37 +0,0 @@
-From linux-kernel-owner+chrisw=40osdl.org-S1030193AbVIAPWg at vger.kernel.org  Thu Sep  1 08:23:18 2005
-Subject: [PATCH] aacraid:  2.6.13 aacraid bad BUG_ON fix
-From: Mark Haverkamp <markh at osdl.org>
-To: James Bottomley <James.Bottomley at steeleye.com>,
-        Andrew Morton <akpm at osdl.org>
-Cc: linux-scsi <linux-scsi at vger.kernel.org>,
-        linux-kernel <linux-kernel at vger.kernel.org>,
-        Mark Salyzyn <mark_salyzyn at adaptec.com>
-Date: 	Thu, 01 Sep 2005 08:19:23 -0700
-
-This was noticed by Doug Bazamic and the fix found by Mark Salyzyn at
-Adaptec.
-
-There was an error in the BUG_ON() statement that validated the
-calculated fib size which can cause the driver to panic.
-
-Signed-off-by: Mark Haverkamp <markh at osdl.org>
-Acked-by: James Bottomley <James.Bottomley at SteelEye.com>
-Signed-off-by: Chris Wright <chrisw at osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
----
- drivers/scsi/aacraid/aachba.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.13.y/drivers/scsi/aacraid/aachba.c
-===================================================================
---- linux-2.6.13.y.orig/drivers/scsi/aacraid/aachba.c
-+++ linux-2.6.13.y/drivers/scsi/aacraid/aachba.c
-@@ -968,7 +968,7 @@ static int aac_read(struct scsi_cmnd * s
- 		fibsize = sizeof(struct aac_read64) + 
- 			((le32_to_cpu(readcmd->sg.count) - 1) * 
- 			 sizeof (struct sgentry64));
--		BUG_ON (fibsize > (sizeof(struct hw_fib) - 
-+		BUG_ON (fibsize > (dev->max_fib_size - 
- 					sizeof(struct aac_fibhdr)));
- 		/*
- 		 *	Now send the Fib to the adapter

Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7	2005-09-20 10:11:13 UTC (rev 4238)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7	2005-09-21 03:41:40 UTC (rev 4239)
@@ -5,7 +5,6 @@
 + sendmsg-DoS.patch
 + fix-pci-rom-mapping.patch
 + sparc-request_irq-in-RTC-fix.patch
-+ aacraid-bad-BUG_ON-fix.patch
 + ipv4-fragmentation-csum-handling.patch
 + fix-socket-filter-regression.patch
 + lost-fput-in-32bit-ioctl-on-x86-64.patch