diff for duplicates of <20151023210008.GG10197@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 40c3310..dc791a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ dma_get_page_shift API, we need to have the sparc constants available in a more typical location. There should be no functional impact to this move, but it is untested. -Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com> +Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com> --- arch/sparc/include/asm/iommu_common.h | 51 +++++++++++++++++++++++++++++++++++ arch/sparc/kernel/iommu.c | 2 +- @@ -26,7 +26,7 @@ index 0000000..b40cec2 @@ -0,0 +1,51 @@ +/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations. + * -+ * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net) ++ * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net) + */ + +#ifndef _IOMMU_COMMON_H @@ -97,7 +97,7 @@ index b40cec2..0000000 @@ -1,51 +0,0 @@ -/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations. - * -- * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net) +- * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net) - */ - -#ifndef _IOMMU_COMMON_H diff --git a/a/content_digest b/N1/content_digest index 4341e41..a259b4c 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 5/7] [RFC PATCH 5/7] sparc: rename kernel/iommu_common.h -> include/asm/iommu_common.h\0" "Date\0Fri, 23 Oct 2015 14:00:08 -0700\0" + "To\0David S. Miller <davem@davemloft.net>\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> + Michael Ellerman <mpe@ellerman.id.au> + Alexey Kardashevskiy <aik@ozlabs.ru> + David Gibson <david@gibson.dropbear.id.au> + Christoph Hellwig <hch@infradead.org> + 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" "In order to cleanly expose the desired IOMMU page shift via the new\n" @@ -9,7 +22,7 @@ "a more typical location. There should be no functional impact to this\n" "move, but it is untested.\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/sparc/include/asm/iommu_common.h | 51 +++++++++++++++++++++++++++++++++++\n" " arch/sparc/kernel/iommu.c | 2 +-\n" @@ -32,7 +45,7 @@ "@@ -0,0 +1,51 @@\n" "+/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations.\n" "+ *\n" - "+ * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net)\n" + "+ * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net)\n" "+ */\n" "+\n" "+#ifndef _IOMMU_COMMON_H\n" @@ -103,7 +116,7 @@ "@@ -1,51 +0,0 @@\n" "-/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations.\n" "- *\n" - "- * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net)\n" + "- * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net)\n" "- */\n" "-\n" "-#ifndef _IOMMU_COMMON_H\n" @@ -259,4 +272,4 @@ "-- \n" 1.9.1 -35908c991304b65ca5e6ed0b2d652a39e54244cdffc39fb4459216a1492b923e +f76939230b0421a45014e91a6a2e5b95f5a7cb0797b3192df91806e353a34e34
diff --git a/a/1.txt b/N2/1.txt index 40c3310..dc791a1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ dma_get_page_shift API, we need to have the sparc constants available in a more typical location. There should be no functional impact to this move, but it is untested. -Signed-off-by: Nishanth Aravamudan <nacc at linux.vnet.ibm.com> +Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com> --- arch/sparc/include/asm/iommu_common.h | 51 +++++++++++++++++++++++++++++++++++ arch/sparc/kernel/iommu.c | 2 +- @@ -26,7 +26,7 @@ index 0000000..b40cec2 @@ -0,0 +1,51 @@ +/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations. + * -+ * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net) ++ * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net) + */ + +#ifndef _IOMMU_COMMON_H @@ -97,7 +97,7 @@ index b40cec2..0000000 @@ -1,51 +0,0 @@ -/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations. - * -- * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net) +- * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net) - */ - -#ifndef _IOMMU_COMMON_H diff --git a/a/content_digest b/N2/content_digest index 4341e41..73337e0 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 5/7] [RFC PATCH 5/7] sparc: rename kernel/iommu_common.h -> include/asm/iommu_common.h\0" - "Date\0Fri, 23 Oct 2015 14:00:08 -0700\0" + "Date\0Fri, 23 Oct 2015 21:00:08 +0000\0" + "To\0sparclinux@vger.kernel.org\0" "\00:1\0" "b\0" "In order to cleanly expose the desired IOMMU page shift via the new\n" @@ -9,7 +10,7 @@ "a more typical location. There should be no functional impact to this\n" "move, but it is untested.\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/sparc/include/asm/iommu_common.h | 51 +++++++++++++++++++++++++++++++++++\n" " arch/sparc/kernel/iommu.c | 2 +-\n" @@ -32,7 +33,7 @@ "@@ -0,0 +1,51 @@\n" "+/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations.\n" "+ *\n" - "+ * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net)\n" + "+ * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net)\n" "+ */\n" "+\n" "+#ifndef _IOMMU_COMMON_H\n" @@ -103,7 +104,7 @@ "@@ -1,51 +0,0 @@\n" "-/* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations.\n" "- *\n" - "- * Copyright (C) 1999, 2008 David S. Miller (davem at davemloft.net)\n" + "- * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net)\n" "- */\n" "-\n" "-#ifndef _IOMMU_COMMON_H\n" @@ -259,4 +260,4 @@ "-- \n" 1.9.1 -35908c991304b65ca5e6ed0b2d652a39e54244cdffc39fb4459216a1492b923e +86329ec5544bd22ee3d29274aa75937f82f31e035a5a25590d3b3c18ac80bb96
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.