[ewg] Re: [GIT PULL] ofed-1.3.1 - cxgb3 fixes

[Vladimir Sokolovsky]

Steve Wise wrote:
> Vlad,
> 
> Please pull from
> 
> git://git.openfabrics.org/~swise/ofed-1.3 ofed_kernel
> 
> All the changes are upstream in 2.6.26.
> 
> Patches added:
> 
> kernel_patches/fixes/cxgb3_0240_fix_port_up_down_error_path.patch
> kernel_patches/fixes/cxgb3_0250_fix_EEH.patch
> kernel_patches/fixes/iw_cxgb3_0200_Dont_add_PBL_memory_to_gen_pool_in_chunks.patch 
> 
> kernel_patches/fixes/iw_cxgb3_0210_Fix_severe_limit_on_userspace_memory_registration_size.patch 
> 
> kernel_patches/fixes/iw_cxgb3_0220_Wrap_the_software_sq_ptr_as_needed_on_flush.patch 
> 
> 
> Steve.
> 

Hi Steve,
ofed_makedist.sh script fails to apply cxgb3_remove_eeh.patch.
Please fix:

 > ./ofed_scripts/ofed_makedist.sh
Importing patch /tmp/build-ofed_kernel-Q23205/ofed_kernel-2.6.11/kernel_patches/backport/2.6.11/cxgb3_remove_eeh.patch (stored as cxgb3_remove_eeh.patch)
/usr/bin/quilt --quiltrc /tmp/build-ofed_kernel-Q23205/ofed_kernel-2.6.11/patches/quiltrc push patches/cxgb3_remove_eeh.patch
Applying patch cxgb3_remove_eeh.patch
patching file drivers/net/cxgb3/cxgb3_main.c
Hunk #1 FAILED at 2426.
Hunk #2 succeeded at 2699 (offset -34 lines).
1 out of 2 hunks FAILED -- rejects in file drivers/net/cxgb3/cxgb3_main.c
Patch cxgb3_remove_eeh.patch does not apply (enforce with -f)

Regards,
Vladimir