[ofa-general] Re: cxgb3_0010_napi.patch fails to be applied

[Steve Wise]

Pull from:

http://git.openfabrics.org/~swise/ofed-1.4 ofed_kernel

Steve.



Vladimir Sokolovsky wrote:
> Hello Steve,
> I merged ofed-1.4 kernel tree with 2.6.26-rc6 kernel.
>
> Now ofed_makedist.sh fails:
>
> Failed executing 
> /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_patch.sh 
> --with-backport=2.6.16 >> 
> /tmp/build-ofed_kernel-R21111/ofed_kernel-2.6.16.log
> Hunk #15 succeeded at 2461 (offset 25 lines).
> Hunk #16 succeeded at 2571 (offset 25 lines).
> Hunk #17 succeeded at 2583 (offset 25 lines).
> Hunk #18 succeeded at 2619 (offset 25 lines).
> Hunk #19 succeeded at 2644 (offset 25 lines).
> Hunk #20 succeeded at 2765 (offset 25 lines).
> 1 out of 20 hunks FAILED -- rejects in file drivers/net/cxgb3/sge.c
> Patch cxgb3_0010_napi.patch does not apply (enforce with -f)
>
> Please fix this issue and add required backports.
>
> git_url: git://git.openfabrics.org/ofed_1_4/linux-2.6.git
> git_branch: ofed_kernel
>
> Regards,
> Vladimir