linux-next: failed import of the rr quilt series

From: Stephen Rothwell
Date: Tue Nov 08 2011 - 18:19:19 EST


Hi Rusty,

Tryiong to import the rr quilt series today produced this error:

Importing rr based on v3.1-8907-g43672a0
$ git reset --hard 43672a0784707d795556b1f93925da8b8e797d03
Checking out files: 100% (37600/37600), done.
HEAD is now at 43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm
$ git am ../quilt/rr/virtio:pci_fix_use_after_free.patch
Applying: virtio-pci: fix use after free
error: patch failed: drivers/virtio/virtio_pci.c:822
error: drivers/virtio/virtio_pci.c: patch does not apply
Patch failed at 0001 virtio-pci: fix use after free
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".

Maybe you forgot to update the BASE?

I will use the rr tree from next-20111108 for today.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature