[ewg] Re: ofed_kernel git tree for OFED-1.4 (based on 2.6.25-rc7)

[Steve Wise]

Vladimir Sokolovsky wrote:
> Hi Steve,
> I prepared ofed_kernel git tree: 
> git://git.openfabrics.org/ofed_1_4/linux-2.6.git branch ofed_kernel.
> This tree merged with 2.6.25-rc7.
> Currently ofed_scripts/ofed_makedist.sh fails on 
> cxgb3_0040_Add_EEH_support.patch:
>
> /usr/bin/quilt --quiltrc 
> /tmp/build-ofed_kernel-g19281/ofed_kernel-2.6.11/patches/quiltrc push 
> patches/cxgb3_0040_Add_EEH_support.patch
> Applying patch cxgb3_0040_Add_EEH_support.patch
> patching file drivers/net/cxgb3/cxgb3_main.c
> Hunk #1 succeeded at 2498 with fuzz 2 (offset 182 lines).
> Hunk #2 FAILED at 2904.
> 1 out of 2 hunks FAILED -- rejects in file drivers/net/cxgb3/cxgb3_main.c
> Patch cxgb3_0040_Add_EEH_support.patch does not apply (enforce with -f)
>
> Should this patch be removed from the git tree?
>
> Regards,
> Vladimir

Yes.  In fact:

All of the cxgb_* patches can be removed except:

cxgb3_00300_add_ofed_version_tag.patch

And all of the iw_cxgb_* patches can be removed.


Steve.