diff for duplicates of <20191113015622.11592-22-sashal@kernel.org> diff --git a/a/1.txt b/N1/1.txt index bb5bdbc..4de4021 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ index 2c6cce8e7cfd0..5e44462960213 100644 - return H_HARDWARE; + return H_TOO_HARD; - if (dir = DMA_NONE) + if (dir == DMA_NONE) return H_SUCCESS; @@ -434,15 +434,15 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, return H_TOO_HARD; diff --git a/a/content_digest b/N1/content_digest index 671c973..ab03032 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020191113015622.11592-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.14 022/115] KVM: PPC: Inform the userspace about TCE update failures\0" - "Date\0Wed, 13 Nov 2019 01:54:49 +0000\0" + "Date\0Tue, 12 Nov 2019 20:54:49 -0500\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" - "Cc\0Alexey Kardashevskiy <aik@ozlabs.ru>" - David Gibson <david@gibson.dropbear.id.au> - Michael Ellerman <mpe@ellerman.id.au> - Sasha Levin <sashal@kernel.org> + "Cc\0Sasha Levin <sashal@kernel.org>" + Alexey Kardashevskiy <aik@ozlabs.ru> kvm-ppc@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + linuxppc-dev@lists.ozlabs.org + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "From: Alexey Kardashevskiy <aik@ozlabs.ru>\n" @@ -44,7 +43,7 @@ "-\t\treturn H_HARDWARE;\n" "+\t\treturn H_TOO_HARD;\n" " \n" - " \tif (dir = DMA_NONE)\n" + " \tif (dir == DMA_NONE)\n" " \t\treturn H_SUCCESS;\n" "@@ -434,15 +434,15 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl,\n" " \t\treturn H_TOO_HARD;\n" @@ -98,4 +97,4 @@ "-- \n" 2.20.1 -68df0c5be1ffff9dbf5e1f7bccd37fd5cbcfa11d602b84a8302561f98d44a18b +5934464bbf33843b3400d0bafc724b2049bcb98c71cee2885aa56d7d8d217a8b
diff --git a/a/1.txt b/N2/1.txt index bb5bdbc..4de4021 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,7 +30,7 @@ index 2c6cce8e7cfd0..5e44462960213 100644 - return H_HARDWARE; + return H_TOO_HARD; - if (dir = DMA_NONE) + if (dir == DMA_NONE) return H_SUCCESS; @@ -434,15 +434,15 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, return H_TOO_HARD; diff --git a/a/content_digest b/N2/content_digest index 671c973..0196145 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020191113015622.11592-1-sashal@kernel.org\0" "From\0Sasha Levin <sashal@kernel.org>\0" "Subject\0[PATCH AUTOSEL 4.14 022/115] KVM: PPC: Inform the userspace about TCE update failures\0" - "Date\0Wed, 13 Nov 2019 01:54:49 +0000\0" + "Date\0Tue, 12 Nov 2019 20:54:49 -0500\0" "To\0linux-kernel@vger.kernel.org" " stable@vger.kernel.org\0" "Cc\0Alexey Kardashevskiy <aik@ozlabs.ru>" @@ -44,7 +44,7 @@ "-\t\treturn H_HARDWARE;\n" "+\t\treturn H_TOO_HARD;\n" " \n" - " \tif (dir = DMA_NONE)\n" + " \tif (dir == DMA_NONE)\n" " \t\treturn H_SUCCESS;\n" "@@ -434,15 +434,15 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl,\n" " \t\treturn H_TOO_HARD;\n" @@ -98,4 +98,4 @@ "-- \n" 2.20.1 -68df0c5be1ffff9dbf5e1f7bccd37fd5cbcfa11d602b84a8302561f98d44a18b +41a2124b3fd103077a5865e161a416ce5f722c9ccf548073b0296ff08f7eda7b
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.