diff for duplicates of <20181103183208.GA56850@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 3c21f33..a804b22 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,8 +35,8 @@ On Sat, Nov 03, 2018 at 09:24:05AM +0000, Anton Ivanov wrote:
 > > > 
 > > This breaks UML build:
 > >    CC      mm/mremap.o
-> > mm/mremap.c: In function ?move_normal_pmd?:
-> > mm/mremap.c:229:2: error: implicit declaration of function ?set_pmd_at?; did you mean ?set_pte_at?? [-Werror=implicit-function-declaration]
+> > mm/mremap.c: In function ‘move_normal_pmd’:
+> > mm/mremap.c:229:2: error: implicit declaration of function ‘set_pmd_at’; did you mean ‘set_pte_at’? [-Werror=implicit-function-declaration]
 > >    set_pmd_at(mm, new_addr, new_pmd, pmd);
 > >    ^~~~~~~~~~
 > >    set_pte_at
@@ -66,26 +66,26 @@ On Sat, Nov 03, 2018 at 09:24:05AM +0000, Anton Ivanov wrote:
 > index 7485398d0737..1692da55e63a 100644
 > --- a/arch/um/include/asm/pgtable.h
 > +++ b/arch/um/include/asm/pgtable.h
-> @@ -359,4 +359,7 @@ do {??????????????????????????????????????????????? \
-> ??????? __flush_tlb_one((vaddr));?????????????? \
-> ?} while (0)
+> @@ -359,4 +359,7 @@ do {                                                \
+>         __flush_tlb_one((vaddr));               \
+>  } while (0)
 > 
 > +extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,
-> +?????????????? pmd_t *pmdp, pmd_t pmd);
+> +               pmd_t *pmdp, pmd_t pmd);
 > +
-> ?#endif
+>  #endif
 > diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
 > index 763d35bdda01..d17b74184ba0 100644
 > --- a/arch/um/kernel/tlb.c
 > +++ b/arch/um/kernel/tlb.c
 > @@ -647,3 +647,9 @@ void force_flush_all(void)
-> ??????????????? vma = vma->vm_next;
-> ??????? }
-> ?}
+>                 vma = vma->vm_next;
+>         }
+>  }
 > +void set_pmd_at(struct mm_struct *mm, unsigned long addr,
-> +?????????????? pmd_t *pmdp, pmd_t pmd)
+> +               pmd_t *pmdp, pmd_t pmd)
 > +{
-> +?????? *pmdp = pmd;
+> +       *pmdp = pmd;
 > +}
 > +
 > 
@@ -116,3 +116,8 @@ index 7cf6b0943090..31ad64dcdae6 100644
  		}
  
  		if (pte_alloc(new_vma->vm_mm, new_pmd))
+
+_______________________________________________
+linux-riscv mailing list
+linux-riscv@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/a/content_digest b/N1/content_digest
index 9f34b11..ef768b9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,69 @@
  "ref\020181103040041.7085-1-joelaf@google.com\0"
  "ref\06886607.O3ZT5bM3Cy@blindfold\0"
  "ref\0e1d039a5-9c83-b9b9-98b5-d39bc48f04e0@kot-begemot.co.uk\0"
- "From\0joel@joelfernandes.org (Joel Fernandes)\0"
- "Subject\0[PATCH -next 0/3] Add support for fast mremap\0"
+ "From\0Joel Fernandes <joel@joelfernandes.org>\0"
+ "Subject\0Re: [PATCH -next 0/3] Add support for fast mremap\0"
  "Date\0Sat, 3 Nov 2018 11:32:08 -0700\0"
- "To\0linux-riscv@lists.infradead.org\0"
+ "To\0Anton Ivanov <anton.ivanov@kot-begemot.co.uk>\0"
+ "Cc\0linux-mips@linux-mips.org"
+  Rich Felker <dalias@libc.org>
+  linux-sh@vger.kernel.org
+  Peter Zijlstra <peterz@infradead.org>
+  Catalin Marinas <catalin.marinas@arm.com>
+  Dave Hansen <dave.hansen@linux.intel.com>
+  Will Deacon <will.deacon@arm.com>
+ " maintainer:X86 ARCHITECTURE \\(32-BIT AND 64-BIT\\) <x86@kernel.org>"
+  Michal Hocko <mhocko@kernel.org>
+  linux-mm@kvack.org
+  lokeshgidra@google.com
+  sparclinux@vger.kernel.org
+  linux-hexagon@vger.kernel.org
+  linux-riscv@lists.infradead.org
+  elfring@users.sourceforge.net
+  Jonas Bonn <jonas@southpole.se>
+  linux-s390@vger.kernel.org
+  dancol@google.com
+  linux-ia64@vge.kvack.org
+  Yoshinori Sato <ysato@users.sourceforge.jp>
+  linux-xtensa@linux-xtensa.org
+  Richard Weinberger <richard@nod.at>
+  Helge Deller <deller@gmx.de>
+  r.kernel.org@lithops.sigma-star.at
+  hughd@google.com
+  James E.J. Bottomley <jejb@parisc-linux.org>
+  kasan-dev@googlegroups.com
+  kvmarm@lists.cs.columbia.edu
+  Ingo Molnar <mingo@redhat.com>
+  Geert Uytterhoeven <geert@linux-m68k.org>
+  Andrey Ryabinin <aryabinin@virtuozzo.com>
+  linux-snps-arc@lists.infradead.org
+  kernel-team@android.com
+  Sam Creasey <sammy@sammy.net>
+  Fenghua Yu <fenghua.yu@intel.com>
+  Jeff Dike <jdike@addtoit.com>
+  linux-um@lists.infradead.org
+  Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
+  Julia Lawall <Julia.Lawall@lip6.fr>
+  linux-m68k@lists.linux-m68k.org
+  Borislav Petkov <bp@alien8.de>
+  Andy Lutomirski <luto@kernel.org>
+  nios2-dev@lists.rocketboards.org
+  kirill@shutemov.name
+  Stafford Horne <shorne@gmail.com>
+  Guan Xuetao <gxt@pku.edu.cn>
+  Chris Zankel <chris@zankel.net>
+  Tony Luck <tony.luck@intel.com>
+  linux-parisc@vger.kernel.org
+  Max Filippov <jcmvbkbc@gmail.com>
+  pantin@google.com
+  linux-kernel@vger.kernel.org
+  minchan@kernel.org
+  Thomas Gleixner <tglx@linutronix.de>
+  linux-alpha@vger.kernel.org
+  Ley Foon Tan <lftan@altera.com>
+  akpm@linux-foundation.org
+  linuxppc-dev@lists.ozlabs.org
+ " David S. Miller <davem@davemloft.net>\0"
  "\00:1\0"
  "b\0"
  "On Sat, Nov 03, 2018 at 09:24:05AM +0000, Anton Ivanov wrote:\n"
@@ -44,8 +103,8 @@
  "> > > \n"
  "> > This breaks UML build:\n"
  "> >    CC      mm/mremap.o\n"
- "> > mm/mremap.c: In function ?move_normal_pmd?:\n"
- "> > mm/mremap.c:229:2: error: implicit declaration of function ?set_pmd_at?; did you mean ?set_pte_at?? [-Werror=implicit-function-declaration]\n"
+ "> > mm/mremap.c: In function \342\200\230move_normal_pmd\342\200\231:\n"
+ "> > mm/mremap.c:229:2: error: implicit declaration of function \342\200\230set_pmd_at\342\200\231; did you mean \342\200\230set_pte_at\342\200\231? [-Werror=implicit-function-declaration]\n"
  "> >    set_pmd_at(mm, new_addr, new_pmd, pmd);\n"
  "> >    ^~~~~~~~~~\n"
  "> >    set_pte_at\n"
@@ -75,26 +134,26 @@
  "> index 7485398d0737..1692da55e63a 100644\n"
  "> --- a/arch/um/include/asm/pgtable.h\n"
  "> +++ b/arch/um/include/asm/pgtable.h\n"
- "> @@ -359,4 +359,7 @@ do {??????????????????????????????????????????????? \\\n"
- "> ??????? __flush_tlb_one((vaddr));?????????????? \\\n"
- "> ?} while (0)\n"
+ "> @@ -359,4 +359,7 @@ do {\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 \\\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240 __flush_tlb_one((vaddr));\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 \\\n"
+ "> \302\240} while (0)\n"
  "> \n"
  "> +extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,\n"
- "> +?????????????? pmd_t *pmdp, pmd_t pmd);\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pmd_t *pmdp, pmd_t pmd);\n"
  "> +\n"
- "> ?#endif\n"
+ "> \302\240#endif\n"
  "> diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c\n"
  "> index 763d35bdda01..d17b74184ba0 100644\n"
  "> --- a/arch/um/kernel/tlb.c\n"
  "> +++ b/arch/um/kernel/tlb.c\n"
  "> @@ -647,3 +647,9 @@ void force_flush_all(void)\n"
- "> ??????????????? vma = vma->vm_next;\n"
- "> ??????? }\n"
- "> ?}\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 vma = vma->vm_next;\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240 }\n"
+ "> \302\240}\n"
  "> +void set_pmd_at(struct mm_struct *mm, unsigned long addr,\n"
- "> +?????????????? pmd_t *pmdp, pmd_t pmd)\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pmd_t *pmdp, pmd_t pmd)\n"
  "> +{\n"
- "> +?????? *pmdp = pmd;\n"
+ "> +\302\240\302\240\302\240\302\240\302\240\302\240 *pmdp = pmd;\n"
  "> +}\n"
  "> +\n"
  "> \n"
@@ -124,6 +183,11 @@
  "+#endif\n"
  " \t\t}\n"
  " \n"
- " \t\tif (pte_alloc(new_vma->vm_mm, new_pmd))"
+ " \t\tif (pte_alloc(new_vma->vm_mm, new_pmd))\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-riscv mailing list\n"
+ "linux-riscv@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-riscv
 
-0a325de7e349d43f976fb99cca51c95d051077b9547c4e892ea26124fbce8fd3
+1d0bd61f169c94453d41103c03194751cb7e335a599765e12d150e1f67fc4a2b
