From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: failed import of rr tree
Date: Tue, 08 May 2012 14:11:39 +0930 [thread overview]
Message-ID: <87397bcmik.fsf@rustcorp.com.au> (raw)
In-Reply-To: <20120508105904.1709f6f2b7da99e86327e3e2@canb.auug.org.au>
On Tue, 8 May 2012 10:59:04 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rusty,
>
> Importing the rr tree today produced this:
>
> $ git am ../quilt/rr/virtio:balloon_separate_out_common_code_between_remove_and_freeze_functions.patch
> Applying: virtio: balloon: separate out common code between remove and freeze functions
> error: patch failed: drivers/virtio/virtio_balloon.c:381
> error: drivers/virtio/virtio_balloon.c: patch does not apply
> Patch failed at 0001 virtio: balloon: separate out common code between remove and freeze functions
My mistake, I slapped those in at the last minute, and put them in the
wrong order.
I've fixed it for tomorrow.
Thanks,
Rusty.
prev parent reply other threads:[~2012-05-08 4:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 0:59 linux-next: failed import of rr tree Stephen Rothwell
2012-05-08 4:41 ` 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=87397bcmik.fsf@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).