> -----Original Message----- > From: James Bottomley [mailto:James.Bottomley@xxxxxxxxxxxxxxxxxxxxx] > Sent: Monday, October 25, 2010 3:09 PM > To: Stephen M. Cameron > Cc: axboe@xxxxxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx; thenzl@xxxxxxxxxx; > Miller, Mike (OS Dev); linux-scsi@xxxxxxxxxxxxxxx; linux- > kernel@xxxxxxxxxxxxxxx > Subject: Re: [PATCH 01/13] cciss: remove controllers supported by hpsa > > On Fri, 2010-10-08 at 15:06 -0500, Stephen M. Cameron wrote: > > From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> > > > > 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@xxxxxxxxxxxxxxxxxx> > > --- > > 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@xxxxxx> > Date: Tue Oct 19 09:40:34 2010 +0200 > > cciss: fix PCI IDs for new Smart Array controllers > > And which is now mainline. > > James I guess I'm the one who jumped the gun on the patch I sent to correct those PCI IDs. I suppose it would be preferable to have no overlapping support between cciss and hpsa. With the distros it's a little easier to draw a line in the sand (or is it?). On some distros it seems migration is impossible, on others it's fairly simple. I guess my point is what do users want? Does a significant number want to use upstream kernels but they still require cciss? Should we force them to go to hpsa? Or should they just add whatever ID they want and go on with life? Maybe if we broke out the PCI IDs into a separate include file for both drivers??? Does that help? Probably not. I saw this coming long ago but I still don't know the answer. Any ideas, comments, suggestions, flames? -- mikem > ÿô.nlj·Ÿ®‰†+%ŠË±é¥Šwÿº{.nlj·¥Š{±þÇ‹ø¡Ü}©ž²ÆzÚj:+v‰¨þø®w¥þŠàÞ¨è&¢)ß«a¶Úÿûz¹ÞúŽŠÝjÿŠwèf
