diff for duplicates of <20151023205925.GF10197@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 766f641..5c24079 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ size from that property if present. If the property isn't present, fallback to looking the value up in struct iommu_table. If we don't find a iommu_table, fallback to the kernel's page size. -Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com> +Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com> --- arch/powerpc/platforms/pseries/iommu.c | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/a/content_digest b/N1/content_digest index 9c8fcb7..546441a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,20 @@ "ref\020151023205420.GA10197@linux.vnet.ibm.com\0" - "From\0nacc@linux.vnet.ibm.com (Nishanth Aravamudan)\0" + "From\0Nishanth Aravamudan <nacc@linux.vnet.ibm.com>\0" "Subject\0[PATCH 4/7 v2] pseries/iommu: implement DDW-aware dma_get_page_shift\0" "Date\0Fri, 23 Oct 2015 13:59:25 -0700\0" + "To\0Michael Ellerman <mpe@ellerman.id.au>\0" + "Cc\0Matthew Wilcox <willy@linux.intel.com>" + Keith Busch <keith.busch@intel.com> + Benjamin Herrenschmidt <benh@kernel.crashing.org> + Paul Mackerras <paulus@samba.org> + Alexey Kardashevskiy <aik@ozlabs.ru> + David Gibson <david@gibson.dropbear.id.au> + Christoph Hellwig <hch@infradead.org> + David S. Miller <davem@davemloft.net> + linux-nvme@lists.infradead.org + linux-kernel@vger.kernel.org + linuxppc-dev@lists.ozlabs.org + " sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "When DDW (Dynamic DMA Windows) are present for a device, we have stored\n" @@ -11,7 +24,7 @@ "fallback to looking the value up in struct iommu_table. If we don't find\n" "a iommu_table, fallback to the kernel's page size.\n" "\n" - "Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com>\n" + "Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>\n" "---\n" " arch/powerpc/platforms/pseries/iommu.c | 36 ++++++++++++++++++++++++++++++++++\n" " 1 file changed, 36 insertions(+)\n" @@ -80,4 +93,4 @@ "-- \n" 1.9.1 -1a7d36b163546c7c41c422211f004238568fbd9038655d4f06d8adb6321939f1 +e8ebccb82ce73fe009f495102980723d5e6362ad15f3b2f8063a0ba0d16577a2
diff --git a/a/1.txt b/N2/1.txt index 766f641..f75c784 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,7 +5,7 @@ size from that property if present. If the property isn't present, fallback to looking the value up in struct iommu_table. If we don't find a iommu_table, fallback to the kernel's page size. -Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com> +Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com> --- arch/powerpc/platforms/pseries/iommu.c | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) @@ -38,8 +38,7 @@ index 0946b98..1bf6471 100644 + * the property + */ + if (dn && PCI_DN(dn)) { -+ const struct dynamic_dma_window_prop *direct64 = -+ of_get_property(dn, DIRECT64_PROPNAME, NULL); ++ const struct dynamic_dma_window_prop *direct64 + of_get_property(dn, DIRECT64_PROPNAME, NULL); + if (direct64) + return be32_to_cpu(direct64->tce_shift); + } diff --git a/a/content_digest b/N2/content_digest index 9c8fcb7..7a4e87c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,8 @@ "ref\020151023205420.GA10197@linux.vnet.ibm.com\0" - "From\0nacc@linux.vnet.ibm.com (Nishanth Aravamudan)\0" + "From\0Nishanth Aravamudan <nacc@linux.vnet.ibm.com>\0" "Subject\0[PATCH 4/7 v2] pseries/iommu: implement DDW-aware dma_get_page_shift\0" - "Date\0Fri, 23 Oct 2015 13:59:25 -0700\0" + "Date\0Fri, 23 Oct 2015 20:59:25 +0000\0" + "To\0sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "When DDW (Dynamic DMA Windows) are present for a device, we have stored\n" @@ -11,7 +12,7 @@ "fallback to looking the value up in struct iommu_table. If we don't find\n" "a iommu_table, fallback to the kernel's page size.\n" "\n" - "Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com>\n" + "Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>\n" "---\n" " arch/powerpc/platforms/pseries/iommu.c | 36 ++++++++++++++++++++++++++++++++++\n" " 1 file changed, 36 insertions(+)\n" @@ -44,8 +45,7 @@ "+\t\t * the property\n" "+\t\t */\n" "+\t\tif (dn && PCI_DN(dn)) {\n" - "+\t\t\tconst struct dynamic_dma_window_prop *direct64 =\n" - "+\t\t\t\tof_get_property(dn, DIRECT64_PROPNAME, NULL);\n" + "+\t\t\tconst struct dynamic_dma_window_prop *direct64 +\t\t\t\tof_get_property(dn, DIRECT64_PROPNAME, NULL);\n" "+\t\t\tif (direct64)\n" "+\t\t\t\treturn be32_to_cpu(direct64->tce_shift);\n" "+\t\t}\n" @@ -80,4 +80,4 @@ "-- \n" 1.9.1 -1a7d36b163546c7c41c422211f004238568fbd9038655d4f06d8adb6321939f1 +734bec9cf97bd0be3542922f690e6e3f2a0dc7f8327ec9b81b95ec813fa6cad8
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.