[ewg] Re: Merging ofed_kernel with 2.6.24-rc5

[Vladimir Sokolovsky]

Erez Zilber wrote:
> Please pull from git://git.openfabrics.org/~erezz/ ofed_kernel_test.git
> ofed_kernel
> 
> It still fails (but not in open-iscsi/iSER patches):
> 
>        
> /tmp/build-ofed_kernel-NNC630/ofed_kernel-2.6.11/kernel_patches/fixes/mlx4_0140_modify_qp_check.patch
> patching file drivers/net/mlx4/qp.c
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file drivers/net/mlx4/qp.c.rej
> Failed to apply patch:
> /tmp/build-ofed_kernel-NNC630/ofed_kernel-2.6.11/kernel_patches/fixes/mlx4_0140_modify_qp_check.patch
> 

Thanks,
Now iscsi backport patch for 2.6.18 fails:

Applying patch open-iscsi-tx-hash-fixes.patch
patching file drivers/scsi/iscsi_tcp.c
Hunk #1 succeeded at 109 (offset 3 lines).
Hunk #2 succeeded at 469 (offset 3 lines).
Hunk #3 succeeded at 649 (offset 3 lines).
Hunk #4 succeeded at 677 (offset 3 lines).
Hunk #5 succeeded at 694 (offset 4 lines).
Hunk #6 succeeded at 748 (offset 4 lines).
Hunk #7 succeeded at 767 (offset 4 lines).
Hunk #8 succeeded at 813 (offset 4 lines).
Hunk #9 succeeded at 887 (offset 4 lines).
Hunk #10 succeeded at 908 (offset 4 lines).
Hunk #11 succeeded at 1211 (offset 4 lines).
Hunk #12 FAILED at 1469.
Hunk #13 FAILED at 1502.
Hunk #14 succeeded at 1536 (offset 4 lines).
Hunk #15 succeeded at 1824 (offset 3 lines).
Hunk #16 succeeded at 1873 (offset 3 lines).
Hunk #17 succeeded at 1884 (offset 3 lines).
2 out of 17 hunks FAILED -- rejects in file drivers/scsi/iscsi_tcp.c
patching file drivers/scsi/iscsi_tcp.h
Patch open-iscsi-tx-hash-fixes.patch does not apply (enforce with -f)