[openib-general] iSER updates

[Or Gerlitz]

Roland Dreier wrote:
> Linus pull my for-2.6.18 branch today, so the RDMA CM is upstream
> now.  He still has not pulled scsi-misc-2.6 so AFAIK there is still
> more required before we can merge iSER.
> 
> However, I had to add the patch below to keep iSER compiling in my
> tree, since <scsi/scsi_request.h> is now gone from the upstream
> kernel.  Also, I notice that there seem to be a few changes to the svn
> tree that you have not sent to me for my git tree (r7784 and r7924 at
> least).  Please send me a patch if there are updates to my git tree
> that you would like before it gets merged...

I was aware that scsi/scsi_request.h was killed by Christoph but as iser 
kept compiling under my copy of your tree with James tree pulled into it 
i have not noticed the breakage... guess the reason for that was an 
update by James which i missed, anyway thanks for catching that and will 
update the SVN.

As for the two updates in the SVN since my last patches were sent to 
you, these are two bug fixes which can go to 2.6.18-rc2, but as i 
understand its fine with you to add them into what's pushed for 
2.6.18-rc1, i will send them today.

Or.

> diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c 
> b/drivers/infiniband/ulp/iser/iscsi_iser.c
> index c051b65..7099e94 100644
> --- a/drivers/infiniband/ulp/iser/iscsi_iser.c
> +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
> @@ -68,7 +68,6 @@ #include <asm/uaccess.h>
>  #include <scsi/scsi_cmnd.h>
>  #include <scsi/scsi_device.h>
>  #include <scsi/scsi_eh.h>
> -#include <scsi/scsi_request.h>
>  #include <scsi/scsi_tcq.h>
>  #include <scsi/scsi_host.h>
>  #include <scsi/scsi.h>
>