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

From: Rusty Russell <[email-masked]>
Date: Thu, 23 Oct 2008 12:12:11 +1100

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.