diff for duplicates of <1440235295-244203-2-git-send-email-agraf@suse.de>
diff --git a/a/1.txt b/N1/1.txt
index ddeac3c..3fc9fe7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,8 +15,7 @@ index 50860e9..29911a0 100644
+++ b/arch/powerpc/kvm/e500_mmu.c
@@ -377,7 +377,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea)
| MAS0_NV(vcpu_e500->gtlb_nv[tlbsel]);
- vcpu->arch.shared->mas1 =
- (vcpu->arch.shared->mas6 & MAS6_SPID0)
+ vcpu->arch.shared->mas1 (vcpu->arch.shared->mas6 & MAS6_SPID0)
- | (vcpu->arch.shared->mas6 & (MAS6_SAS ? MAS1_TS : 0))
+ | ((vcpu->arch.shared->mas6 & MAS6_SAS) ? MAS1_TS : 0)
| (vcpu->arch.shared->mas4 & MAS4_TSIZED(~0));
diff --git a/a/content_digest b/N1/content_digest
index c7c220b..e6e39b2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PULL 01/12] KVM: PPC: fix suspicious use of conditional operator\0"
]
[
- "Date\0Sat, 22 Aug 2015 11:21:24 +0200\0"
+ "Date\0Sat, 22 Aug 2015 09:21:24 +0000\0"
]
[
"To\0kvm-ppc <kvm-ppc\@vger.kernel.org>\0"
@@ -43,8 +43,7 @@
"+++ b/arch/powerpc/kvm/e500_mmu.c\n",
"\@\@ -377,7 +377,7 \@\@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea)\n",
" \t\t\t| MAS0_NV(vcpu_e500->gtlb_nv[tlbsel]);\n",
- " \t\tvcpu->arch.shared->mas1 =\n",
- " \t\t\t (vcpu->arch.shared->mas6 & MAS6_SPID0)\n",
+ " \t\tvcpu->arch.shared->mas1 \t\t\t (vcpu->arch.shared->mas6 & MAS6_SPID0)\n",
"-\t\t\t| (vcpu->arch.shared->mas6 & (MAS6_SAS ? MAS1_TS : 0))\n",
"+\t\t\t| ((vcpu->arch.shared->mas6 & MAS6_SAS) ? MAS1_TS : 0)\n",
" \t\t\t| (vcpu->arch.shared->mas4 & MAS4_TSIZED(~0));\n",
@@ -54,4 +53,4 @@
"1.8.1.4"
]
-dae035fe3d63f7beff6f90a883259224e1908d1e32c7b5563d921778fa1553ec
+f01601018a09588d070daeef7d8e037f710100aa0f77cd99e3195a0cf9aa2c92
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.