On Wed, 2010-07-28 at 15:54 +0530, Vikas Chaudhary wrote: > On Jul 28, 2010, at 2:22 AM, James Bottomley wrote: > > > On Tue, 2010-07-27 at 13:45 -0700, Ravi Anand wrote: > >> > >>> On Tue, 2010-07-27 James Bottomley wrote: > >>> On Tue, 2010-07-27 at 11:56 -0700, Yinghai Lu wrote: > >>> LD drivers/scsi/built-in.o > >>> drivers/scsi/qla4xxx/built-in.o: In function `qla82xx_idc_unlock': > >>> (.text+0x8814): multiple definition of `qla82xx_idc_unlock' > >>> drivers/scsi/qla2xxx/built-in.o:(.text+0x2ea14): first defined here > >>> drivers/scsi/qla2xxx/built-in.o:(.text+0x30c56): first defined here > >>> make[1]: *** [drivers/scsi/built-in.o] Error 1 > >>> make: *** [drivers/scsi/] Error 2 > >> > >>> This is because exactly the same functions appear in the qla2xxx/ > >>> and > >>> qla4xxx/ directories > >> > >>> Qlogic people, please get this sorted out now, otherwise I'll drop > >>> the > >>> qla4xxx update before sending to Linus > >> > >> We will try to resolve this ASAP. > > > > Thanks > > > >> When are you planning to send it to Linus ? > > > > Whenever he opens the merge window ... he's been making noises like it > > will be this week. > > > >>> The best option would be to separate out the 82xx functions so > >>> that both > >>> 2xxx and 4xxx can use them. In the interim, you could add a > >>> discriminator prefix. > >> > >> We will put in discriminator prefix and repost the patches. > > > > Just the one patch that adds the 82xx support, if possible ... that > > way > > I can just swap the bad one out. > > I am sending new 82xx support patch in next mail which address this > issue. > We added new discriminator prefix "qla4_8xxx_*" for qla4xxx drive > module. > > Please swap new 82xx patch with earlier patch. OK, I've done the patch swap and it all seems to be working now. Thanks, James -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
