linux-next: failed import of rr tree

linux-next: failed import of rr tree

[Stephen Rothwell]

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

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

so I tried applying the patch with patch(1):

$ patch -p1 -E <.git/rebase-apply/0001
patching file drivers/virtio/virtio_balloon.c
Hunk #1 FAILED at 381.
Hunk #2 succeeded at 408 (offset -1 lines).
1 out of 2 hunks FAILED -- saving rejects to file drivers/virtio/virtio_balloon.c.rej

Did you use the wrong base (v3.4-rc6)?

I will use the rr tree from next-20120507 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: failed import of rr tree

[Rusty Russell]

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.