Anthony Liguori <aligu...@us.ibm.com> writes: > Hi, > > Thank you for submitting your patch series. This note is to inform > you that this patch series no longer applies against the latest > qemu.git tree.
FYI, I checked this before I let it send this. It definitely doesn't apply either with --3way or even with fuzzing. If it's against a different tree, you can just put a tag in the subject like [PATCH scsi-next 0/2] to prevent these messages in the future. Regards, Anthony Liguori > > If it's been at least a few days since you submitted this series, > please resubmit a new version of your patch series so it can be > considered for inclusion. If you submitted recently, please wait a > few days for patch review feedback and then resubmit. > > Here is the output from git-am: > > Applying: iscsi: do not leak acb->buf when commands are aborted > fatal: sha1 information is lacking or useless (block/iscsi.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 iscsi: do not leak acb->buf when commands are aborted > The copy of the patch that failed is found in: > /home/aliguori/.patches/git-working/.git/rebase-apply/patch > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > > > Regards, > > Anthony Liguori