Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Wed, Dec 19, 2012 at 2:44 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> After merging the infiniband tree, today's linux-next build (x86_64_
> allmodconfig) failed like this:
>
> In file included from drivers/scsi/csiostor/csio_wr.h:42:0,
>                  from drivers/scsi/csiostor/csio_scsi.h:49,
>                  from drivers/scsi/csiostor/csio_init.h:45,
>                  from drivers/scsi/csiostor/csio_attr.c:45:
> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: nested redefinition of 'enum fw_retval'
> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: redeclaration of 'enum fw_retval'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:42:6: note: originally defined here
> drivers/scsi/csiostor/t4fw_api_stor.h:48:2: error: redeclaration of enumerator 'FW_ENOEXEC'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:39:2: note: previous definition of 'FW_ENOEXEC' was here
> drivers/scsi/csiostor/t4fw_api_stor.h:50:2: error: redeclaration of enumerator 'FW_ENOMEM'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:43:2: note: previous definition of 'FW_ENOMEM' was here
> drivers/scsi/csiostor/t4fw_api_stor.h:58:2: error: redeclaration of enumerator 'FW_EADDRINUSE'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:44:2: note: previous definition of 'FW_EADDRINUSE' was here
>
> And several others similar.
>
> Caused by commit f65b56b15931 ("RDMA/cxgb4: Fix LE hash collision bug for
> active open connection").


Vipul, is the right fix to pull the full list of FW return values from
t4fw_api_stor.h into t4fw_api.h as part of this patch (f65b56b15931)?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/