Re: [BK PATCH] SCSI updates for 2.6.9

Andrew Morton
2004-10-19T05:07:22Z

Dmitry Torokhov <dtor_core@ameritech.net> wrote:
>
> On Monday 18 October 2004 05:03 pm, James Bottomley wrote:
>
> > Matthew Wilcox:
> > o Add SPI-5 constants to scsi.h
>
> This breaks Firewire SBP2 build:

Insert grumpy comment wrt testing in -mm.

> CC [M] drivers/ieee1394/sbp2.o
> In file included from drivers/ieee1394/sbp2.c:78:
> drivers/ieee1394/sbp2.h:61:1: warning: "ABORT_TASK_SET" redefined
> In file included from drivers/scsi/scsi.h:31,
> from drivers/ieee1394/sbp2.c:67:
> include/scsi/scsi.h:255:1: warning: this is the location of the previous definition
> In file included from drivers/ieee1394/sbp2.c:78:
> drivers/ieee1394/sbp2.h:62:1: warning: "LOGICAL_UNIT_RESET" redefined
> In file included from drivers/scsi/scsi.h:31,
> from drivers/ieee1394/sbp2.c:67:
> include/scsi/scsi.h:267:1: warning: this is the location of the previous definition
>
> It looks like firewire has its own set of commands with conflicting names.
> Who should win?

Probably 1394 should be using less generic-looking names.

I assume this patch broke drivers/s390/scsi/zfcp_def.h as well.