linux-next: failed import of the rr quilt series

linux-next: failed import of the rr quilt series

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 961 bytes --]

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@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: failed import of the rr quilt series

[Rusty Russell]

On Wed, 9 Nov 2011 10:19:09 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Non-text part: multipart/signed
> 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

Fuzz, I didn't notice (since it's a warning, not an error here).
Verified it, and refreshed.

Thanks,
Rusty.