Vladimir Sokolovsky wrote: > > Hi Erez, > I am trying to merge 2.6.24-rc5 into ofed_kernel git tree. > The following patch: > iscsi-sync-kernel-code-with-release-2.0-865.15.patch is broken after > the merge. > > To reproduce: clone ~vlad/ofed_kernel_test.git ofatest >
I don't see the ofatest branch on this git tree. > Now at patch ipoib_selector_updated.patch > > /tmp/build-ofed_kernel-c26987/ofed_kernel-2.6.11/kernel_patches/fixes/iscsi-sync-kernel-code-with-release-2.0-865.15.patch > /usr/bin/quilt --quiltrc > /tmp/build-ofed_kernel-c26987/ofed_kernel-2.6.11/patches/quiltrc import > /tmp/build-ofed_kernel-c26987/ofed_kernel-2.6.11/kernel_patches/fixes/iscsi-sync-kernel-code-with-release-2.0-865.15.patch > Importing patch > /tmp/build-ofed_kernel-c26987/ofed_kernel-2.6.11/kernel_patches/fixes/iscsi-sync-kernel-code-with-release-2.0-865.15.patch > (stored as iscsi-sync-kernel-code-with-release-2.0-865.15.patch) > /usr/bin/quilt --quiltrc > /tmp/build-ofed_kernel-c26987/ofed_kernel-2.6.11/patches/quiltrc push > patches/iscsi-sync-kernel-code-with-release-2.0-865.15.patch > Applying patch iscsi-sync-kernel-code-with-release-2.0-865.15.patch > patching file drivers/scsi/iscsi_tcp.c > Hunk #3 FAILED at 200. > Hunk #10 FAILED at 418. > > Are you trying to apply this patch on 2.6.11 or am I missing something? Erez _______________________________________________ ewg mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
