diff for duplicates of <20140612181420.65b05675@kryten> diff --git a/a/1.txt b/N1/1.txt index 2711982..9818be5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,8 @@ Signed-off-by: Anton Blanchard <anton@samba.org> --- Index: b/arch/powerpc/kvm/book3s_interrupts.S -=================================--- a/arch/powerpc/kvm/book3s_interrupts.S +=================================================================== +--- a/arch/powerpc/kvm/book3s_interrupts.S +++ b/arch/powerpc/kvm/book3s_interrupts.S @@ -25,11 +25,9 @@ #include <asm/exception-64s.h> @@ -57,7 +58,8 @@ Index: b/arch/powerpc/kvm/book3s_interrupts.S /* If RESUME_GUEST, get back in the loop */ cmpwi r3, RESUME_GUEST Index: b/arch/powerpc/kvm/book3s_rmhandlers.S -=================================--- a/arch/powerpc/kvm/book3s_rmhandlers.S +=================================================================== +--- a/arch/powerpc/kvm/book3s_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S @@ -34,13 +34,7 @@ * * diff --git a/a/content_digest b/N1/content_digest index a81bf18..f8c2e66 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "From\0Anton Blanchard <anton@samba.org>\0" "Subject\0[PATCH 1/4] KVM: PPC: Book3S PR: Fix ABIv2 issues\0" - "Date\0Thu, 12 Jun 2014 08:14:20 +0000\0" + "Date\0Thu, 12 Jun 2014 18:14:20 +1000\0" "To\0benh@kernel.crashing.org" paulus@samba.org agraf@suse.de " clg@fr.ibm.com\0" "Cc\0linuxppc-dev@lists.ozlabs.org" - kvm-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "binutils knows that a branch to a function descriptor is actually\n" @@ -18,7 +18,8 @@ "---\n" "\n" "Index: b/arch/powerpc/kvm/book3s_interrupts.S\n" - "=================================--- a/arch/powerpc/kvm/book3s_interrupts.S\n" + "===================================================================\n" + "--- a/arch/powerpc/kvm/book3s_interrupts.S\n" "+++ b/arch/powerpc/kvm/book3s_interrupts.S\n" "@@ -25,11 +25,9 @@\n" " #include <asm/exception-64s.h>\n" @@ -69,7 +70,8 @@ " \t/* If RESUME_GUEST, get back in the loop */\n" " \tcmpwi\tr3, RESUME_GUEST\n" "Index: b/arch/powerpc/kvm/book3s_rmhandlers.S\n" - "=================================--- a/arch/powerpc/kvm/book3s_rmhandlers.S\n" + "===================================================================\n" + "--- a/arch/powerpc/kvm/book3s_rmhandlers.S\n" "+++ b/arch/powerpc/kvm/book3s_rmhandlers.S\n" "@@ -34,13 +34,7 @@\n" " * *\n" @@ -86,4 +88,4 @@ " \n" .macro INTERRUPT_TRAMPOLINE intno -87af57fce0d3d613fca6aa2f22b56969121f7fe447e5ba6ffba4933bd0be419b +a1fada5440ed330101462d4b0f98e739b2687894ecad17a115623f5fc9447777
diff --git a/a/1.txt b/N2/1.txt index 2711982..9818be5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,8 @@ Signed-off-by: Anton Blanchard <anton@samba.org> --- Index: b/arch/powerpc/kvm/book3s_interrupts.S -=================================--- a/arch/powerpc/kvm/book3s_interrupts.S +=================================================================== +--- a/arch/powerpc/kvm/book3s_interrupts.S +++ b/arch/powerpc/kvm/book3s_interrupts.S @@ -25,11 +25,9 @@ #include <asm/exception-64s.h> @@ -57,7 +58,8 @@ Index: b/arch/powerpc/kvm/book3s_interrupts.S /* If RESUME_GUEST, get back in the loop */ cmpwi r3, RESUME_GUEST Index: b/arch/powerpc/kvm/book3s_rmhandlers.S -=================================--- a/arch/powerpc/kvm/book3s_rmhandlers.S +=================================================================== +--- a/arch/powerpc/kvm/book3s_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S @@ -34,13 +34,7 @@ * * diff --git a/a/content_digest b/N2/content_digest index a81bf18..8c09526 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "From\0Anton Blanchard <anton@samba.org>\0" "Subject\0[PATCH 1/4] KVM: PPC: Book3S PR: Fix ABIv2 issues\0" - "Date\0Thu, 12 Jun 2014 08:14:20 +0000\0" + "Date\0Thu, 12 Jun 2014 18:14:20 +1000\0" "To\0benh@kernel.crashing.org" paulus@samba.org agraf@suse.de @@ -18,7 +18,8 @@ "---\n" "\n" "Index: b/arch/powerpc/kvm/book3s_interrupts.S\n" - "=================================--- a/arch/powerpc/kvm/book3s_interrupts.S\n" + "===================================================================\n" + "--- a/arch/powerpc/kvm/book3s_interrupts.S\n" "+++ b/arch/powerpc/kvm/book3s_interrupts.S\n" "@@ -25,11 +25,9 @@\n" " #include <asm/exception-64s.h>\n" @@ -69,7 +70,8 @@ " \t/* If RESUME_GUEST, get back in the loop */\n" " \tcmpwi\tr3, RESUME_GUEST\n" "Index: b/arch/powerpc/kvm/book3s_rmhandlers.S\n" - "=================================--- a/arch/powerpc/kvm/book3s_rmhandlers.S\n" + "===================================================================\n" + "--- a/arch/powerpc/kvm/book3s_rmhandlers.S\n" "+++ b/arch/powerpc/kvm/book3s_rmhandlers.S\n" "@@ -34,13 +34,7 @@\n" " * *\n" @@ -86,4 +88,4 @@ " \n" .macro INTERRUPT_TRAMPOLINE intno -87af57fce0d3d613fca6aa2f22b56969121f7fe447e5ba6ffba4933bd0be419b +a7de7e1aa565e577080520619f354a442b8a9c447f30e0924a2b1dc663157121
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.