[ewg] Re: Merging ofed_kernel with 2.6.24-rc5

[Vladimir Sokolovsky]

Erez Zilber wrote:
>> Sorry, I meant ~vlad/ofed_kernel_test.git ofed_kernel branch.
>>
>> ./ofed_scripts/ofed_makedist.sh - applies patches from
>> kernel_patches/fixes
>> first and then patches from kernel_patches/backports following kernel
>> version.
>>
>> Your patch is under kernel_patches/fixes and it fails on any kernel.
>>
>> - Vladimir
>>
> 
> I see that the script fails on something with IPoIB:
> 
> patching file drivers/infiniband/ulp/ipoib/ipoib_main.c
> Hunk #2 succeeded at 783 (offset 3 lines).
> Hunk #3 succeeded at 918 (offset 3 lines).
> Hunk #4 succeeded at 987 (offset 3 lines).
>        
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0040_checksum-offload.patch
> patching file drivers/infiniband/ulp/ipoib/ipoib.h
> patching file drivers/infiniband/ulp/ipoib/ipoib_cm.c
> patching file drivers/infiniband/ulp/ipoib/ipoib_ib.c
> patching file drivers/infiniband/ulp/ipoib/ipoib_main.c
> Hunk #1 succeeded at 1123 (offset 3 lines).
> Hunk #2 succeeded at 1184 (offset 3 lines).
>        
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0050_Add-LSO-support.patch
> patching file drivers/infiniband/ulp/ipoib/ipoib.h
> patching file drivers/infiniband/ulp/ipoib/ipoib_cm.c
> patching file drivers/infiniband/ulp/ipoib/ipoib_ib.c
> patching file drivers/infiniband/ulp/ipoib/ipoib_main.c
> Hunk #1 succeeded at 716 (offset 3 lines).
> Hunk #2 succeeded at 1206 (offset 3 lines).
>        
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0060_ethtool-support.patch
> patching file drivers/infiniband/ulp/ipoib/Makefile
> patching file drivers/infiniband/ulp/ipoib/ipoib.h
> patching file drivers/infiniband/ulp/ipoib/ipoib_etool.c
> patching file drivers/infiniband/ulp/ipoib/ipoib_main.c
> Hunk #1 succeeded at 974 (offset 3 lines).
>        
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0070_modiy_cq_params.patch
> patching file drivers/infiniband/ulp/ipoib/ipoib.h
> patching file drivers/infiniband/ulp/ipoib/ipoib_etool.c
>        
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0080_broadcast_null.patch
> patching file drivers/infiniband/ulp/ipoib/ipoib_main.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/infiniband/ulp/ipoib/ipoib_main.c.rej
> Failed to apply patch:
> /tmp/build-ofed_kernel-d30977/ofed_kernel-2.6.11/kernel_patches/fixes/ipoib_0080_broadcast_null.patch

Somehow the order of applied patches is different for me.
I removed 'kernel_patches/fixes/ipoib_0080_broadcast_null.patch' patch.
Please update your tree and rerun ofed_makedist.sh.

Regards,
Vladimir