[ofa-general] Re: ofed_kernel git tree for OFED-1.4 (based on 2.6.25-rc7)
I have been busier than I thought. I guess the best thing to do is delete the ipath fixes and backport patches for now and then when you pull from 2.6.26, we can create new backport patches and fixes. On Wed, 2008-04-16 at 15:52 +0300, Vladimir Sokolovsky wrote: > Hi Ralph, > 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 > ipath_0180_header_file_changes_to_support_IBA7220.patch: > > > ./ofed_scripts/ofed_makedist.sh > > git clone -q -s -n /local/scm/ofed-1.4/linux-2.6 > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > Initialized empty Git repository in > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11/.git/ > pushd /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > /local/scm/ofed-1.4/linux-2.6 > /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_checkout.sh > 3bb85a2f1c15d1e58cd8b0b2da0577a3ab98977a > cdbdfc5cc29c4add1a2d6967b137a3347112a199 >> > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_patch.sh > --with-backport=2.6.11 >> /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > Failed executing /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_patch.sh > --with-backport=2.6.11 >> /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > Hunk #7 FAILED at 565. > Hunk #8 succeeded at 582 (offset 1 line). > Hunk #9 succeeded at 595 (offset 1 line). > Hunk #10 FAILED at 613. > Hunk #11 succeeded at 719 (offset 2 lines). > Hunk #12 FAILED at 857. > 3 out of 12 hunks FAILED -- rejects in file > drivers/infiniband/hw/ipath/ipath_verbs.h > Patch ipath_0180_header_file_changes_to_support_IBA7220.patch does not apply > (enforce with -f) > > Failed executing /usr/bin/quiltBuild failed in /tmp/build-ofed_kernel-d23175 > See log file /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > > Should ipath patches be removed from the git tree > (kernel_patches/fixes/ipath*)? > > Regards, > Vladimir > > ___ general mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
[ofa-general] Re: ofed_kernel git tree for OFED-1.4 (based on 2.6.25-rc7)
On Wed, 2008-04-16 at 15:52 +0300, Vladimir Sokolovsky wrote: > Hi Ralph, > 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 > ipath_0180_header_file_changes_to_support_IBA7220.patch: > > > ./ofed_scripts/ofed_makedist.sh > > git clone -q -s -n /local/scm/ofed-1.4/linux-2.6 > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > Initialized empty Git repository in > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11/.git/ > pushd /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11 > /local/scm/ofed-1.4/linux-2.6 > /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_checkout.sh > 3bb85a2f1c15d1e58cd8b0b2da0577a3ab98977a > cdbdfc5cc29c4add1a2d6967b137a3347112a199 >> > /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_patch.sh > --with-backport=2.6.11 >> /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > Failed executing /local/scm/ofed-1.4/linux-2.6/ofed_scripts/ofed_patch.sh > --with-backport=2.6.11 >> /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > Hunk #7 FAILED at 565. > Hunk #8 succeeded at 582 (offset 1 line). > Hunk #9 succeeded at 595 (offset 1 line). > Hunk #10 FAILED at 613. > Hunk #11 succeeded at 719 (offset 2 lines). > Hunk #12 FAILED at 857. > 3 out of 12 hunks FAILED -- rejects in file > drivers/infiniband/hw/ipath/ipath_verbs.h > Patch ipath_0180_header_file_changes_to_support_IBA7220.patch does not apply > (enforce with -f) > > Failed executing /usr/bin/quiltBuild failed in /tmp/build-ofed_kernel-d23175 > See log file /tmp/build-ofed_kernel-d23175/ofed_kernel-2.6.11.log > > Should ipath patches be removed from the git tree > (kernel_patches/fixes/ipath*)? > > Regards, > Vladimir No, I will take a look and fix things. Once 2.6.26 opens we can probably delete kernel_patches/fixes/ipath*. ___ general mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
