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

From: Rusty Russell <[email-masked]>
Date: Tue, 08 May 2012 14:11:39 +0930

On Tue, 8 May 2012 10:59:04 +1000, Stephen Rothwell <[email-masked]> 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.