diff for duplicates of <20170127172328.18574-1-l.stach@pengutronix.de>
diff --git a/a/content_digest b/N1/content_digest
index ffb8f2f..1216a3f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -33,9 +33,7 @@
" Ralf Baechle <ralf\@linux-mips.org>",
" iommu\@lists.linux-foundation.org",
" kernel\@pengutronix.de",
- " Paolo Bonzini <pbonzini\@redhat.com>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " Alexander Graf <agraf\@suse.com>\0"
+ " Paolo Bonzini <pbonzini\@redhat.c>\0"
]
[
"\0000:1\0"
@@ -142,4 +140,4 @@
"2.11.0"
]
-58cfeea05e3246c1cbf642990c208f6629cc1a36cbcd564124085b5d01e44656
+4fc3193ea6c2447216e3a06cb858a0e70cc5ad6a3f3f69598318909bedc6d1c1
diff --git a/a/1.txt b/N2/1.txt
index 11109b6..60dc9d5 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -93,4 +93,10 @@ index eced9fee582b..c5a745b521c0 100644
INIT_LIST_HEAD(&cc.migratepages);
--
-2.11.0
\ No newline at end of file
+2.11.0
+
+--
+To unsubscribe, send a message with 'unsubscribe linux-mm' in
+the body to majordomo@kvack.org. For more info on Linux MM,
+see: http://www.linux-mm.org/ .
+Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index ffb8f2f..1f7f3eb 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -139,7 +139,13 @@
" \tINIT_LIST_HEAD(&cc.migratepages);\n",
" \n",
"-- \n",
- "2.11.0"
+ "2.11.0\n",
+ "\n",
+ "--\n",
+ "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n",
+ "the body to majordomo\@kvack.org. For more info on Linux MM,\n",
+ "see: http://www.linux-mm.org/ .\n",
+ "Don't email: <a href=mailto:\"dont\@kvack.org\"> email\@kvack.org </a>"
]
-58cfeea05e3246c1cbf642990c208f6629cc1a36cbcd564124085b5d01e44656
+d4aa8f82286ed555df0435cc957b47f9176c4675c93e65cb9ea4ecf3ccada4a7
diff --git a/a/content_digest b/N3/content_digest
index ffb8f2f..ce7eb63 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Lucas Stach <l.stach\@pengutronix.de>\0"
+ "From\0l.stach\@pengutronix.de (Lucas Stach)\0"
]
[
"Subject\0[PATCH v2 1/3] mm: alloc_contig_range: allow to specify GFP mask\0"
@@ -8,34 +8,7 @@
"Date\0Fri, 27 Jan 2017 18:23:26 +0100\0"
]
[
- "To\0Andrew Morton <akpm\@linux-foundation.org>\0"
-]
-[
- "Cc\0linux-mips\@linux-mips.org",
- " Michal Hocko <mhocko\@suse.com>",
- " kvm\@vger.kernel.org",
- " Radim Kr\304\215m\303\241\305\231 <rkrcmar\@redhat.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Max Filippov <jcmvbkbc\@gmail.com>",
- " H . Peter Anvin <hpa\@zytor.com>",
- " Joerg Roedel <joro\@8bytes.org>",
- " Russell King <linux\@armlinux.org.uk>",
- " patchwork-lst\@pengutronix.de",
- " Ingo Molnar <mingo\@redhat.com>",
- " Vlastimil Babka <vbabka\@suse.cz>",
- " linux-xtensa\@linux-xtensa.org",
- " kvm-ppc\@vger.kernel.org",
- " Thomas Gleixner <tglx\@linutronix.de>",
- " linux-arm-kernel\@lists.infradead.org",
- " Chris Zankel <chris\@zankel.net>",
- " linux-mm\@kvack.org",
- " Ralf Baechle <ralf\@linux-mips.org>",
- " iommu\@lists.linux-foundation.org",
- " kernel\@pengutronix.de",
- " Paolo Bonzini <pbonzini\@redhat.com>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " Alexander Graf <agraf\@suse.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -142,4 +115,4 @@
"2.11.0"
]
-58cfeea05e3246c1cbf642990c208f6629cc1a36cbcd564124085b5d01e44656
+4d8d11f3f25ebda1819b62b4269b699bf7447e18d830cd1f2caa0d27329d702e
diff --git a/a/1.txt b/N4/1.txt
index 11109b6..843f911 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -46,7 +46,7 @@ index c960459eda7e..fbd67d866f67 100644
+ ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA,
+ GFP_KERNEL);
mutex_unlock(&cma_mutex);
- if (ret == 0) {
+ if (ret = 0) {
page = pfn_to_page(pfn);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3edb759c5c7d..6ed8b160fc0d 100644
diff --git a/a/content_digest b/N4/content_digest
index ffb8f2f..4967c8c 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -5,7 +5,7 @@
"Subject\0[PATCH v2 1/3] mm: alloc_contig_range: allow to specify GFP mask\0"
]
[
- "Date\0Fri, 27 Jan 2017 18:23:26 +0100\0"
+ "Date\0Fri, 27 Jan 2017 17:23:26 +0000\0"
]
[
"To\0Andrew Morton <akpm\@linux-foundation.org>\0"
@@ -92,7 +92,7 @@
"+\t\tret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA,\n",
"+\t\t\t\t\t GFP_KERNEL);\n",
" \t\tmutex_unlock(&cma_mutex);\n",
- " \t\tif (ret == 0) {\n",
+ " \t\tif (ret = 0) {\n",
" \t\t\tpage = pfn_to_page(pfn);\n",
"diff --git a/mm/hugetlb.c b/mm/hugetlb.c\n",
"index 3edb759c5c7d..6ed8b160fc0d 100644\n",
@@ -142,4 +142,4 @@
"2.11.0"
]
-58cfeea05e3246c1cbf642990c208f6629cc1a36cbcd564124085b5d01e44656
+0a4b660966f9883d3d3048f05d9650d70b261f6bb82f7a054ea5d47850dd96f6
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.