From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Cc: axboe@kernel.dk, akpm@linux-foundation.org, thenzl@redhat.com,
mike.miller@hp.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 01/13] cciss: remove controllers supported by hpsa
Date: Mon, 25 Oct 2010 15:09:20 -0500 [thread overview]
Message-ID: <1288037360.5487.730.camel@mulgrave.site> (raw)
In-Reply-To: <20101008200606.24279.37953.stgit@beardog.cce.hp.com>
On Fri, 2010-10-08 at 15:06 -0500, Stephen M. Cameron wrote:
> From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
>
> We would prefer not to have any overlap between the two drivers.
> Remove the cciss_allow_hpsa option, as it it is no longer needed.
>
> Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
> ---
> drivers/block/cciss.c | 38 +-------------------------------------
> 1 files changed, 1 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 5e4fadc..ca900ea 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -66,12 +66,6 @@ MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers");
> MODULE_VERSION("3.6.26");
> MODULE_LICENSE("GPL");
>
> -static int cciss_allow_hpsa;
> -module_param(cciss_allow_hpsa, int, S_IRUGO|S_IWUSR);
> -MODULE_PARM_DESC(cciss_allow_hpsa,
> - "Prevent cciss driver from accessing hardware known to be "
> - " supported by the hpsa driver");
> -
> #include "cciss_cmd.h"
> #include "cciss.h"
> #include <linux/cciss_ioctl.h>
> @@ -98,18 +92,6 @@ static const struct pci_device_id cciss_pci_device_id[] = {
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243},
> - {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_DEVICE_ID_HP_CISSE, 0x103C, 0x3250},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3251},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253},
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254},
This hunk conflicts with the update Mike Miller sent
commit 6362beea8914cbd4630ccde3617d944aeca2d48f
Author: Mike Miller <mike.miller@hp.com>
Date: Tue Oct 19 09:40:34 2010 +0200
cciss: fix PCI IDs for new Smart Array controllers
And which is now mainline.
James
next prev parent reply other threads:[~2010-10-25 20:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 20:06 [PATCH 00/13] Patches for cciss and hpsa Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 01/13] cciss: remove controllers supported by hpsa Stephen M. Cameron
2010-10-25 20:09 ` James Bottomley [this message]
2010-10-25 20:26 ` Miller, Mike (OS Dev)
2010-10-25 22:04 ` scameron
2010-10-08 20:06 ` [PATCH 02/13] hpsa: fix board status waiting code Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 03/13] hpsa: Use kernel provided PCI state save and restore functions Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 04/13] hpsa: limit commands allocated on reset_devices Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 05/13] hpsa: do not reset unknown boards " Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 06/13] cciss: fix board status waiting code Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 07/13] cciss: Use kernel provided PCI state save and restore functions Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 08/13] cciss: limit commands allocated on reset_devices Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 09/13] cciss: use usleep_range not msleep for small sleeps Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 10/13] hpsa: take the adapter lock in hpsa_wait_for_mode_change_ack Stephen M. Cameron
2010-10-08 20:06 ` [PATCH 11/13] hpsa: allow driver to put controller in either simple or performant mode Stephen M. Cameron
2010-10-08 20:07 ` [PATCH 12/13] hpsa: use usleep_range not msleep for small sleeps Stephen M. Cameron
2010-10-08 20:07 ` [PATCH 13/13] hpsa: defend against zero sized buffers in passthru ioctls Stephen M. Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288037360.5487.730.camel@mulgrave.site \
--to=james.bottomley@hansenpartnership.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mike.miller@hp.com \
--cc=scameron@beardog.cce.hp.com \
--cc=thenzl@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox