diff for duplicates of <87d2hzbgln.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 1157f37..b2a5ed3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ Andreas didn't pull all the changes because TM changes had issues like http://article.gmane.org/gmane.comp.emulators.kvm.devel/118411 +<<<<<<< HEAD -+===+ /* Save DEC */ ++======= ++ /* Save DEC */ + mfspr r5,SPRN_DEC + mftb r6 + extsw r5,r5 @@ -55,7 +56,8 @@ Which got reverted in the next patch http://article.gmane.org/gmane.comp.emulators.kvm.powerpc.devel/8571 -<<<<<<< HEAD --===- /* Save DEC */ +-======= +- /* Save DEC */ - mfspr r5,SPRN_DEC - mftb r6 - extsw r5,r5 diff --git a/a/content_digest b/N1/content_digest index 9172fea..9771e7e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,13 @@ "ref\020140306111836.GA5729@iris.ozlabs.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 1/2] Revert \"KVM: PPC: Book3S HV: Add new state for transactional memory\"\0" - "Date\0Thu, 06 Mar 2014 13:41:24 +0000\0" + "Date\0Thu, 06 Mar 2014 18:59:24 +0530\0" "To\0Paul Mackerras <paulus@samba.org>\0" - "Cc\0agraf@suse.de" - benh@kernel.crashing.org - linuxppc-dev@lists.ozlabs.org - kvm-ppc@vger.kernel.org + "Cc\0Michael Neuling <mikey@neuling.org>" kvm@vger.kernel.org - " Michael Neuling <mikey@neuling.org>\0" + agraf@suse.de + kvm-ppc@vger.kernel.org + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "Paul Mackerras <paulus@samba.org> writes:\n" @@ -41,7 +40,8 @@ "http://article.gmane.org/gmane.comp.emulators.kvm.devel/118411\n" "\n" "+<<<<<<< HEAD\n" - "+===+\t/* Save DEC */\n" + "+=======\n" + "+\t/* Save DEC */\n" "+\tmfspr\tr5,SPRN_DEC\n" "+\tmftb\tr6\n" "+\textsw\tr5,r5\n" @@ -69,7 +69,8 @@ "http://article.gmane.org/gmane.comp.emulators.kvm.powerpc.devel/8571\n" "\n" "-<<<<<<< HEAD\n" - "-===-\t/* Save DEC */\n" + "-=======\n" + "-\t/* Save DEC */\n" "-\tmfspr\tr5,SPRN_DEC\n" "-\tmftb\tr6\n" "-\textsw\tr5,r5\n" @@ -371,4 +372,4 @@ "\n" -aneesh -829832398de075a297f230a2410848097f0cb134280d78e26d3c259f1eb20107 +8bc9991539f5c236c8c83e0e7625e1dccbcfe64ff80a78ed5126fecf2b5adaf8
diff --git a/a/1.txt b/N2/1.txt index 1157f37..b2a5ed3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,7 +27,8 @@ Andreas didn't pull all the changes because TM changes had issues like http://article.gmane.org/gmane.comp.emulators.kvm.devel/118411 +<<<<<<< HEAD -+===+ /* Save DEC */ ++======= ++ /* Save DEC */ + mfspr r5,SPRN_DEC + mftb r6 + extsw r5,r5 @@ -55,7 +56,8 @@ Which got reverted in the next patch http://article.gmane.org/gmane.comp.emulators.kvm.powerpc.devel/8571 -<<<<<<< HEAD --===- /* Save DEC */ +-======= +- /* Save DEC */ - mfspr r5,SPRN_DEC - mftb r6 - extsw r5,r5 diff --git a/a/content_digest b/N2/content_digest index 9172fea..ae7c908 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020140306111836.GA5729@iris.ozlabs.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 1/2] Revert \"KVM: PPC: Book3S HV: Add new state for transactional memory\"\0" - "Date\0Thu, 06 Mar 2014 13:41:24 +0000\0" + "Date\0Thu, 06 Mar 2014 18:59:24 +0530\0" "To\0Paul Mackerras <paulus@samba.org>\0" "Cc\0agraf@suse.de" benh@kernel.crashing.org @@ -41,7 +41,8 @@ "http://article.gmane.org/gmane.comp.emulators.kvm.devel/118411\n" "\n" "+<<<<<<< HEAD\n" - "+===+\t/* Save DEC */\n" + "+=======\n" + "+\t/* Save DEC */\n" "+\tmfspr\tr5,SPRN_DEC\n" "+\tmftb\tr6\n" "+\textsw\tr5,r5\n" @@ -69,7 +70,8 @@ "http://article.gmane.org/gmane.comp.emulators.kvm.powerpc.devel/8571\n" "\n" "-<<<<<<< HEAD\n" - "-===-\t/* Save DEC */\n" + "-=======\n" + "-\t/* Save DEC */\n" "-\tmfspr\tr5,SPRN_DEC\n" "-\tmftb\tr6\n" "-\textsw\tr5,r5\n" @@ -371,4 +373,4 @@ "\n" -aneesh -829832398de075a297f230a2410848097f0cb134280d78e26d3c259f1eb20107 +14762506d808547dce15d791045b870070ac29242b4f6296ac193941e5f700bf
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.