[ewg] Re: ofed_kernel merged with 2.6.24-rc1 patches update required

[Erez Zilber]

Vladimir Sokolovsky wrote:
>
> Hello,
> There is a new branch "ofed_kernel_2_6_24_rc1" under 
> git://git.openfabrics.org/ofed_1_3/linux-2.6.git
>
> All patches from kernel_patches/fixes that were applied in 2.6.24-rc1 
> were removed from kernel_patches/fixes directory.
> The "problematic" patches from kernel_patches/fixes were moved to the 
> kernel_patches/attic directory.
>
> Backport patches and fixes should be updated according to the new 
> kernel tree.
> The easy way to do so is using "ofed_scripts/ofed_makedist.sh" utility 
> which creates tgz file for every supported kernel with all relevant 
> patches applied.
>
> We want to move to the new branch on this Wednesday (31 Oct 2007)
> Please send me updated backport patches and fixes by tomorrow.
>
>
> Regards,
> Vladimir
>

Vlad,

I'm trying to run ofed_makedist.sh according to the instructions from 
https://wiki.openfabrics.org/tiki-index.php?page=HOWTO+Build+OFA+kernel+package:

[root at rosemary linux-2.6]# ./ofed_scripts/ofed_makedist.sh
git clone -q -s -n /home/erezz/work/ofed/linux-2.6 
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11
pushd /tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11 
/home/erezz/work/ofed/linux-2.6
/home/erezz/work/ofed/linux-2.6/ofed_scripts/ofed_checkout.sh 
e9f4951c8b3e2e784860545edf93b83189e34ce6 
379afb8172cceb63872bd1ce8d1b318abf18bcf9 >> 
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11.log
/home/erezz/work/ofed/linux-2.6/ofed_scripts/ofed_patch.sh 
--with-backport=2.6.11 >> 
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11.log
Failed executing 
/home/erezz/work/ofed/linux-2.6/ofed_scripts/ofed_patch.sh 
--with-backport=2.6.11 >> 
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11.log
        
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11/kernel_patches/backport/2.6.11/ipoib_8111_to_2_6_16.patch
patching file drivers/infiniband/ulp/ipoib/ipoib.h
Hunk #1 succeeded at 350 (offset 20 lines).
patching file drivers/infiniband/ulp/ipoib/ipoib_main.c
Hunk #2 FAILED at 856.
Hunk #3 succeeded at 897 (offset -8 lines).
Hunk #4 succeeded at 916 with fuzz 2 (offset -1 lines).
Hunk #5 succeeded at 932 (offset -8 lines).
1 out of 5 hunks FAILED -- saving rejects to file 
drivers/infiniband/ulp/ipoib/ipoib_main.c.rej
Failed to apply patch: 
/tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11/kernel_patches/backport/2.6.11/ipoib_8111_to_2_6_16.patch
Build failed in /tmp/build-ofed_kernel-nm2119
See log file /tmp/build-ofed_kernel-nm2119/ofed_kernel-2.6.11.log