rpms/kernel/F-7 stable-reverts.patch,1.3,1.4
Dave Jones (davej)
fedora-extras-commits at redhat.com
Sat Jun 9 01:15:24 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674
Modified Files:
stable-reverts.patch
Log Message:
drop the 2nd revert.
stable-reverts.patch:
Index: stable-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/stable-reverts.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stable-reverts.patch 8 Jun 2007 18:33:24 -0000 1.3
+++ stable-reverts.patch 9 Jun 2007 01:14:49 -0000 1.4
@@ -187,142 +187,3 @@
--
-From davej Fri Jun 8 03:25:47 2007
-Return-Path: <chrisw at sous-sol.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.0 (2007-05-01) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-101.7 required=5.0 tests=AWL,BAYES_20,
- UNPARSEABLE_RELAY,USER_IN_WHITELIST autolearn=no version=3.2.0
-Received: from pobox.devel.redhat.com [10.11.255.8]
- by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
- for <davej at localhost> (single-drop); Fri, 08 Jun 2007 03:25:47 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
- by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
- Fri, 08 Jun 2007 03:24:08 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
- by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l587O72o019081
- for <davej at pobox.devel.redhat.com>; Fri, 8 Jun 2007 03:24:07 -0400
-Received: from sous-sol.org (vpn-248-45.boston.redhat.com [10.13.248.45])
- by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l587O6im006711;
- Fri, 8 Jun 2007 03:24:06 -0400
-Received: from sous-sol.org (localhost.localdomain [127.0.0.1])
- by sous-sol.org (8.14.1/8.14.1) with ESMTP id l587MMdu026491;
- Fri, 8 Jun 2007 00:22:22 -0700
-Received: (from chrisw at localhost)
- by sous-sol.org (8.14.1/8.14.1/Submit) id l587MMhR026490;
- Fri, 8 Jun 2007 00:22:22 -0700
-Message-Id: <20070608072222.066056000 at sous-sol.org>
-References: <20070608072127.352723000 at sous-sol.org>
-User-Agent: quilt/0.46-1
-Date: Fri, 08 Jun 2007 00:22:04 -0700
-From: Chris Wright <chrisw at sous-sol.org>
-To: linux-kernel at vger.kernel.org, stable at kernel.org
-Cc: Justin Forbes <jmforbes at linuxtx.org>,
- Zwane Mwaikambo <zwane at arm.linux.org.uk>,
- "Theodore Ts'o" <tytso at mit.edu>, Randy Dunlap <rdunlap at xenotime.net>,
- Dave Jones <davej at redhat.com>, Chuck Wolber <chuckw at quantumlinux.com>,
- Chris Wedgwood <reviews at ml.cw.f00f.org>,
- Michael Krufky <mkrufky at linuxtv.org>,
- Chuck Ebbert <cebbert at redhat.com>,
- Domenico Andreoli <cavokz at gmail.com>, torvalds at linux-foundation.org,
- akpm at linux-foundation.org, alan at lxorguk.ukuu.org.uk,
- Mark Salyzyn <mark_salyzyn at adaptec.com>,
- James Bottomley <James.Bottomley at SteelEye.com>,
- Mark Salyzyn <aacraid at adaptec.com>,
- Greg Kroah-Hartman <gregkh at suse.de>
-Subject: [patch 37/54] SCSI: aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
-Content-Disposition: inline; filename=aacraid-correct-sa-platform-support.patch
-X-Virus-Scanned: ClamAV version 0.90.2, clamav-milter version 0.90.2 on sequoia.sous-sol.org
-X-Virus-Status: Clean
-Status: RO
-X-Status: A
-Content-Length: 3147
-Lines: 84
-
--stable review patch. If anyone has any objections, please let us know.
----------------------
-
-From: Mark Salyzyn <mark_salyzyn at adaptec.com>
-
-As discussed in the bugzilla outlined below, we have an sa based
-(Mustang) RAID adapter on the system, a Dell PERC2/QC. Affected
-controllers are HP NetRAID, Adaptec AAC-364, Dell PERC2/QC or Adaptec
-5400S. This problem coincides with the introduction of the adapter_comm
-and adapter_deliver platform functions (Message [PATCH 1/4] aacraid:
-rework communication support code, January 23 2007, which initially
-migrated to 2.6.21)
-
-The panic occurs with an uninitialized adapter_deliver platform function
-pointer. The enclosed patch, unmodified as tested by Rainer, solves the
-problem.
-
-Signed-off-by: Mark Salyzyn <aacraid at adaptec.com>
-Signed-off-by: James Bottomley <James.Bottomley at SteelEye.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
-Signed-off-by: Chris Wright <chrisw at sous-sol.org>
-
----
- drivers/scsi/aacraid/aacraid.h | 1 +
- drivers/scsi/aacraid/rx.c | 2 +-
- drivers/scsi/aacraid/sa.c | 9 ++++++++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
---- linux-2.6.21.4.orig/drivers/scsi/aacraid/aacraid.h
-+++ linux-2.6.21.4/drivers/scsi/aacraid/aacraid.h
-@@ -1840,6 +1840,7 @@ struct aac_driver_ident* aac_get_driver_
- int aac_get_adapter_info(struct aac_dev* dev);
- int aac_send_shutdown(struct aac_dev *dev);
- int aac_probe_container(struct aac_dev *dev, int cid);
-+int aac_rx_deliver_producer(struct fib * fib);
- extern int numacb;
- extern int acbsize;
- extern char aac_driver_version[];
---- linux-2.6.21.4.orig/drivers/scsi/aacraid/rx.c
-+++ linux-2.6.21.4/drivers/scsi/aacraid/rx.c
-@@ -378,7 +378,7 @@ static int aac_rx_check_health(struct aa
- *
- * Will send a fib, returning 0 if successful.
- */
--static int aac_rx_deliver_producer(struct fib * fib)
-+int aac_rx_deliver_producer(struct fib * fib)
- {
- struct aac_dev *dev = fib->dev;
- struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
---- linux-2.6.21.4.orig/drivers/scsi/aacraid/sa.c
-+++ linux-2.6.21.4/drivers/scsi/aacraid/sa.c
-@@ -5,7 +5,7 @@
- * based on the old aacraid driver that is..
- * Adaptec aacraid device driver for Linux.
- *
-- * Copyright (c) 2000 Adaptec, Inc. (aacraid at adaptec.com)
-+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid at adaptec.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -258,6 +258,11 @@ static void aac_sa_start_adapter(struct
- NULL, NULL, NULL, NULL, NULL);
- }
-
-+static int aac_sa_restart_adapter(struct aac_dev *dev, int bled)
-+{
-+ return -EINVAL;
-+}
-+
- /**
- * aac_sa_check_health
- * @dev: device to check if healthy
-@@ -367,7 +372,9 @@ int aac_sa_init(struct aac_dev *dev)
- dev->a_ops.adapter_notify = aac_sa_notify_adapter;
- dev->a_ops.adapter_sync_cmd = sa_sync_cmd;
- dev->a_ops.adapter_check_health = aac_sa_check_health;
-+ dev->a_ops.adapter_restart = aac_sa_restart_adapter;
- dev->a_ops.adapter_intr = aac_sa_intr;
-+ dev->a_ops.adapter_deliver = aac_rx_deliver_producer;
- dev->a_ops.adapter_ioremap = aac_sa_ioremap;
-
- /*
-
---
-
More information about the scm-commits
mailing list