diff for duplicates of <aac1e71953b564d48f2d1288e50924ebd7e3e98a.camel@perches.com>
diff --git a/a/1.txt b/N1/1.txt
index e3c6e52..86ff2fa 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -51,9 +51,4 @@ so this could be something like:
dev_info(&dev->dev, "Probed LPC memory of %#llu%c and special purpose memory of %#llu%c\n",
si_val(afu->lpc_mem_size), si_type(afu->lpc_mem_size),
- si_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));
-
-
-_______________________________________________
-Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
-To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
\ No newline at end of file
+ si_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 572119d..70e984b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -22,6 +22,7 @@
]
[
"Cc\0Aneesh Kumar K . V <aneesh.kumar\@linux.ibm.com>",
+ " Oliver O'Halloran <oohall\@gmail.com>",
" Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
" Paul Mackerras <paulus\@samba.org>",
" Michael Ellerman <mpe\@ellerman.id.au>",
@@ -29,6 +30,9 @@
" Andrew Donnellan <ajd\@linux.ibm.com>",
" Arnd Bergmann <arnd\@arndb.de>",
" Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ " Vishal Verma <vishal.l.verma\@intel.com>",
+ " Dave Jiang <dave.jiang\@intel.com>",
+ " Ira Weiny <ira.weiny\@intel.com>",
" Andrew Morton <akpm\@linux-foundation.org>",
" Mauro Carvalho Chehab <mchehab+samsung\@kernel.org>",
" David S. Miller <davem\@davemloft.net>",
@@ -110,12 +114,7 @@
"\n",
" dev_info(&dev->dev, \"Probed LPC memory of %#llu%c and special purpose memory of %#llu%c\\n\",\n",
" si_val(afu->lpc_mem_size), si_type(afu->lpc_mem_size),\n",
- "\t\tsi_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));\n",
- "\n",
- "\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list -- linux-nvdimm\@lists.01.org\n",
- "To unsubscribe send an email to linux-nvdimm-leave\@lists.01.org"
+ "\t\tsi_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));"
]
-811591574283d8868ae31c11a6d742fb2c0a7d19adcb2f31008e58dc89908887
+f36793a2e43b217e97497cab4ac4814b1652aab69fd1b862013df886805c09c4
diff --git a/a/1.txt b/N2/1.txt
index e3c6e52..86ff2fa 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -51,9 +51,4 @@ so this could be something like:
dev_info(&dev->dev, "Probed LPC memory of %#llu%c and special purpose memory of %#llu%c\n",
si_val(afu->lpc_mem_size), si_type(afu->lpc_mem_size),
- si_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));
-
-
-_______________________________________________
-Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
-To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
\ No newline at end of file
+ si_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 572119d..55815f1 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -21,34 +21,35 @@
" Alastair D'Silva <alastair\@d-silva.org>\0"
]
[
- "Cc\0Aneesh Kumar K . V <aneesh.kumar\@linux.ibm.com>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Paul Mackerras <paulus\@samba.org>",
- " Michael Ellerman <mpe\@ellerman.id.au>",
- " Frederic Barrat <fbarrat\@linux.ibm.com>",
- " Andrew Donnellan <ajd\@linux.ibm.com>",
- " Arnd Bergmann <arnd\@arndb.de>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Andrew Morton <akpm\@linux-foundation.org>",
+ "Cc\0Madhavan Srinivasan <maddy\@linux.vnet.ibm.com>",
+ " Alexey Kardashevskiy <aik\@ozlabs.ru>",
+ " Masahiro Yamada <yamada.masahiro\@socionext.com>",
+ " Oliver O'Halloran <oohall\@gmail.com>",
" Mauro Carvalho Chehab <mchehab+samsung\@kernel.org>",
- " David S. Miller <davem\@davemloft.net>",
+ " Ira Weiny <ira.weiny\@intel.com>",
" Rob Herring <robh\@kernel.org>",
- " Anton Blanchard <anton\@ozlabs.org>",
+ " Dave Jiang <dave.jiang\@intel.com>",
+ " linux-nvdimm <linux-nvdimm\@lists.01.org>",
+ " Aneesh Kumar K . V <aneesh.kumar\@linux.ibm.com>",
" Krzysztof Kozlowski <krzk\@kernel.org>",
- " Mahesh Salgaonkar <mahesh\@linux.vnet.ibm.com>",
- " Madhavan Srinivasan <maddy\@linux.vnet.ibm.com>",
- " C\303\251dric Le Goater <clg\@kaod.org>",
" Anju T Sudhakar <anju\@linux.vnet.ibm.com>",
- " Hari Bathini <hbathini\@linux.ibm.com>",
- " Thomas Gleixner <tglx\@linutronix.de>",
+ " Mahesh Salgaonkar <mahesh\@linux.vnet.ibm.com>",
+ " Andrew Donnellan <ajd\@linux.ibm.com>",
+ " Arnd Bergmann <arnd\@arndb.de>",
" Greg Kurz <groug\@kaod.org>",
" Nicholas Piggin <npiggin\@gmail.com>",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " Alexey Kardashevskiy <aik\@ozlabs.ru>",
+ " C\303\251dric Le Goater <clg\@kaod.org>",
+ " Thomas Gleixner <tglx\@linutronix.de>",
+ " Hari Bathini <hbathini\@linux.ibm.com>",
+ " Linux MM <linux-mm\@kvack.org>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
" Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
+ " Vishal Verma <vishal.l.verma\@intel.com>",
+ " Frederic Barrat <fbarrat\@linux.ibm.com>",
+ " Paul Mackerras <paulus\@samba.org>",
+ " Andrew Morton <akpm\@linux-foundation.org>",
" linuxppc-dev <linuxppc-dev\@lists.ozlabs.org>",
- " linux-nvdimm <linux-nvdimm\@lists.01.org>",
- " Linux MM <linux-mm\@kvack.org>\0"
+ " David S. Miller <davem\@davemloft.net>\0"
]
[
"\0000:1\0"
@@ -110,12 +111,7 @@
"\n",
" dev_info(&dev->dev, \"Probed LPC memory of %#llu%c and special purpose memory of %#llu%c\\n\",\n",
" si_val(afu->lpc_mem_size), si_type(afu->lpc_mem_size),\n",
- "\t\tsi_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));\n",
- "\n",
- "\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list -- linux-nvdimm\@lists.01.org\n",
- "To unsubscribe send an email to linux-nvdimm-leave\@lists.01.org"
+ "\t\tsi_val(afu->special_purpose_mem_size), si_type(afu->special_purpose_mem_size));"
]
-811591574283d8868ae31c11a6d742fb2c0a7d19adcb2f31008e58dc89908887
+ac075cb1d1f53866d4edc2b562516f92e6cff93b1cb5f02c16ec9b0e3f32c68a
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.