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@xxxxxxxxxxxxxxxx
Attachment:
pgp5PT9pEAAYo.pgp
Description: PGP signature
