linux-next: failed import of the rr tree

linux-next: failed import of the rr tree

[Stephen Rothwell]

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

Hi Rusty,

Today's linux-next import of the rr tree failed like this:

virtio:net-mergeable-rx-bufs.patch
error: patch failed: include/linux/virtio_net.h:44
error: include/linux/virtio_net.h: patch does not apply

patch(1) will not apply that patch either ...

$ patch -p1 -E <.dotest/patch 
patching file drivers/net/virtio_net.c
patching file include/linux/virtio_net.h
Hunk #2 FAILED at 45.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/virtio_net.h.rej

I removed that patch from the series today and hope that nothing later
depended on it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: failed import of the rr tree

[Rusty Russell]

On Thursday 23 October 2008 10:29:51 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next import of the rr tree failed like this:
>
> virtio:net-mergeable-rx-bufs.patch
> error: patch failed: include/linux/virtio_net.h:44
> error: include/linux/virtio_net.h: patch does not apply
>
> patch(1) will not apply that patch either ...

Yes, just found this now.  emacs diff mode got confused by the "--" at the 
bottom of the patch, and "fixed" the @@ line.

Dropping it was the right thing, and I've fixed it.

Sorry,
Rusty.