From: Rusty Russell <rusty@rustcorp•com.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Mark McLoughlin <markmc@redhat•com>
Subject: Re: linux-next: failed import of the rr tree
Date: Thu, 23 Oct 2008 12:12:11 +1100 [thread overview]
Message-ID: <200810231212.11891.rusty@rustcorp.com.au> (raw)
In-Reply-To: <20081023102951.db38e08c.sfr@canb.auug.org.au>
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.
prev parent reply other threads:[~2008-10-23 1:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-22 23:29 linux-next: failed import of the rr tree Stephen Rothwell
2008-10-23 1:12 ` Rusty Russell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200810231212.11891.rusty@rustcorp.com.au \
--to=rusty@rustcorp$(echo .)com.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markmc@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox