diff for duplicates of <1458821494.7860.9.camel@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index f33cb6d..bf5848e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,34 +35,34 @@ On ke, 2016-03-23 at 11:39 +0530, akash.goel@intel.com wrote:
 > Signed-off-by: Sourab Gupta <sourab.gupta@intel.com>
 > Signed-off-by: Akash Goel <akash.goel@intel.com>
 > ---
->  include/linux/shmem_fs.h | 17 +++++++++++++++++
->  mm/shmem.c               | 17 ++++++++++++++++-
->  2 files changed, 33 insertions(+), 1 deletion(-)
+> A include/linux/shmem_fs.h | 17 +++++++++++++++++
+> A mm/shmem.cA A A A A A A A A A A A A A A | 17 ++++++++++++++++-
+> A 2 files changed, 33 insertions(+), 1 deletion(-)
 > 
 > diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
 > index 4d4780c..6cfa76a 100644
 > --- a/include/linux/shmem_fs.h
 > +++ b/include/linux/shmem_fs.h
 > @@ -34,11 +34,28 @@ struct shmem_sb_info {
->  	struct mempolicy *mpol;     /* default memory policy for mappings */
->  };
->  
+> A 	struct mempolicy *mpol;A A A A A /* default memory policy for mappings */
+> A };
+> A 
 > +struct shmem_dev_info {
 > +	void *dev_private_data;
 > +	int (*dev_migratepage)(struct address_space *mapping,
-> +			       struct page *newpage, struct page *page,
-> +			       enum migrate_mode mode, void *dev_priv_data);
+> +			A A A A A A A struct page *newpage, struct page *page,
+> +			A A A A A A A enum migrate_mode mode, void *dev_priv_data);
 
 One might want to have a separate shmem_dev_operations struct or
 similar.
 
 > +};
 > +
->  static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
->  {
->  	return container_of(inode, struct shmem_inode_info, vfs_inode);
->  }
->  
+> A static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
+> A {
+> A 	return container_of(inode, struct shmem_inode_info, vfs_inode);
+> A }
+> A 
 > +static inline int shmem_set_device_ops(struct address_space *mapping,
 > +				struct shmem_dev_info *info)
 > +{
@@ -82,21 +82,21 @@ all.
 > +	return 0;
 > +}
 > +
->  /*
->   * Functions in mm/shmem.c called directly from elsewhere:
->   */
+> A /*
+> A  * Functions in mm/shmem.c called directly from elsewhere:
+> A  */
 > diff --git a/mm/shmem.c b/mm/shmem.c
 > index 440e2a7..f8625c4 100644
 > --- a/mm/shmem.c
 > +++ b/mm/shmem.c
 > @@ -952,6 +952,21 @@ redirty:
->  	return 0;
->  }
->  
+> A 	return 0;
+> A }
+> A 
 > +#ifdef CONFIG_MIGRATION
 > +static int shmem_migratepage(struct address_space *mapping,
-> +			     struct page *newpage, struct page *page,
-> +			     enum migrate_mode mode)
+> +			A A A A A struct page *newpage, struct page *page,
+> +			A A A A A enum migrate_mode mode)
 > +{
 > +	struct shmem_dev_info *dev_info = mapping->private_data;
 > +
@@ -108,23 +108,25 @@ all.
 > +}
 > +#endif
 > +
->  #ifdef CONFIG_NUMA
->  #ifdef CONFIG_TMPFS
->  static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)
+> A #ifdef CONFIG_NUMA
+> A #ifdef CONFIG_TMPFS
+> A static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)
 > @@ -3168,7 +3183,7 @@ static const struct address_space_operations shmem_aops = {
->  	.write_end	= shmem_write_end,
->  #endif
->  #ifdef CONFIG_MIGRATION
+> A 	.write_end	= shmem_write_end,
+> A #endif
+> A #ifdef CONFIG_MIGRATION
 > -	.migratepage	= migrate_page,
 > +	.migratepage	= shmem_migratepage,
->  #endif
->  	.error_remove_page = generic_error_remove_page,
->  };
+> A #endif
+> A 	.error_remove_page = generic_error_remove_page,
+> A };
 -- 
 Joonas Lahtinen
 Open Source Technology Center
 Intel Corporation
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+
+--
+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>
diff --git a/a/content_digest b/N1/content_digest
index f1ca10e..a69991b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "ref\01458713384-25688-1-git-send-email-akash.goel@intel.com\0"
  "From\0Joonas Lahtinen <joonas.lahtinen@linux.intel.com>\0"
- "Subject\0Re: [PATCH 1/2] shmem: Support for registration of Driver/file owner specific ops\0"
+ "Subject\0Re: [Intel-gfx] [PATCH 1/2] shmem: Support for registration of Driver/file owner specific ops\0"
  "Date\0Thu, 24 Mar 2016 14:11:34 +0200\0"
  "To\0akash.goel@intel.com"
  " intel-gfx@lists.freedesktop.org\0"
@@ -46,34 +46,34 @@
  "> Signed-off-by: Sourab Gupta <sourab.gupta@intel.com>\n"
  "> Signed-off-by: Akash Goel <akash.goel@intel.com>\n"
  "> ---\n"
- "> \302\240include/linux/shmem_fs.h | 17 +++++++++++++++++\n"
- "> \302\240mm/shmem.c\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| 17 ++++++++++++++++-\n"
- "> \302\2402 files changed, 33 insertions(+), 1 deletion(-)\n"
+ "> A include/linux/shmem_fs.h | 17 +++++++++++++++++\n"
+ "> A mm/shmem.cA A A A A A A A A A A A A A A | 17 ++++++++++++++++-\n"
+ "> A 2 files changed, 33 insertions(+), 1 deletion(-)\n"
  "> \n"
  "> diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h\n"
  "> index 4d4780c..6cfa76a 100644\n"
  "> --- a/include/linux/shmem_fs.h\n"
  "> +++ b/include/linux/shmem_fs.h\n"
  "> @@ -34,11 +34,28 @@ struct shmem_sb_info {\n"
- "> \302\240\tstruct mempolicy *mpol;\302\240\302\240\302\240\302\240\302\240/* default memory policy for mappings */\n"
- "> \302\240};\n"
- "> \302\240\n"
+ "> A \tstruct mempolicy *mpol;A A A A A /* default memory policy for mappings */\n"
+ "> A };\n"
+ "> A \n"
  "> +struct shmem_dev_info {\n"
  "> +\tvoid *dev_private_data;\n"
  "> +\tint (*dev_migratepage)(struct address_space *mapping,\n"
- "> +\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct page *newpage, struct page *page,\n"
- "> +\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240enum migrate_mode mode, void *dev_priv_data);\n"
+ "> +\t\t\tA A A A A A A struct page *newpage, struct page *page,\n"
+ "> +\t\t\tA A A A A A A enum migrate_mode mode, void *dev_priv_data);\n"
  "\n"
  "One might want to have a separate shmem_dev_operations struct or\n"
  "similar.\n"
  "\n"
  "> +};\n"
  "> +\n"
- "> \302\240static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)\n"
- "> \302\240{\n"
- "> \302\240\treturn container_of(inode, struct shmem_inode_info, vfs_inode);\n"
- "> \302\240}\n"
- "> \302\240\n"
+ "> A static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)\n"
+ "> A {\n"
+ "> A \treturn container_of(inode, struct shmem_inode_info, vfs_inode);\n"
+ "> A }\n"
+ "> A \n"
  "> +static inline int shmem_set_device_ops(struct address_space *mapping,\n"
  "> +\t\t\t\tstruct shmem_dev_info *info)\n"
  "> +{\n"
@@ -93,21 +93,21 @@
  "> +\treturn 0;\n"
  "> +}\n"
  "> +\n"
- "> \302\240/*\n"
- "> \302\240 * Functions in mm/shmem.c called directly from elsewhere:\n"
- "> \302\240 */\n"
+ "> A /*\n"
+ "> A  * Functions in mm/shmem.c called directly from elsewhere:\n"
+ "> A  */\n"
  "> diff --git a/mm/shmem.c b/mm/shmem.c\n"
  "> index 440e2a7..f8625c4 100644\n"
  "> --- a/mm/shmem.c\n"
  "> +++ b/mm/shmem.c\n"
  "> @@ -952,6 +952,21 @@ redirty:\n"
- "> \302\240\treturn 0;\n"
- "> \302\240}\n"
- "> \302\240\n"
+ "> A \treturn 0;\n"
+ "> A }\n"
+ "> A \n"
  "> +#ifdef CONFIG_MIGRATION\n"
  "> +static int shmem_migratepage(struct address_space *mapping,\n"
- "> +\t\t\t\302\240\302\240\302\240\302\240\302\240struct page *newpage, struct page *page,\n"
- "> +\t\t\t\302\240\302\240\302\240\302\240\302\240enum migrate_mode mode)\n"
+ "> +\t\t\tA A A A A struct page *newpage, struct page *page,\n"
+ "> +\t\t\tA A A A A enum migrate_mode mode)\n"
  "> +{\n"
  "> +\tstruct shmem_dev_info *dev_info = mapping->private_data;\n"
  "> +\n"
@@ -119,25 +119,27 @@
  "> +}\n"
  "> +#endif\n"
  "> +\n"
- "> \302\240#ifdef CONFIG_NUMA\n"
- "> \302\240#ifdef CONFIG_TMPFS\n"
- "> \302\240static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)\n"
+ "> A #ifdef CONFIG_NUMA\n"
+ "> A #ifdef CONFIG_TMPFS\n"
+ "> A static void shmem_show_mpol(struct seq_file *seq, struct mempolicy *mpol)\n"
  "> @@ -3168,7 +3183,7 @@ static const struct address_space_operations shmem_aops = {\n"
- "> \302\240\t.write_end\t= shmem_write_end,\n"
- "> \302\240#endif\n"
- "> \302\240#ifdef CONFIG_MIGRATION\n"
+ "> A \t.write_end\t= shmem_write_end,\n"
+ "> A #endif\n"
+ "> A #ifdef CONFIG_MIGRATION\n"
  "> -\t.migratepage\t= migrate_page,\n"
  "> +\t.migratepage\t= shmem_migratepage,\n"
- "> \302\240#endif\n"
- "> \302\240\t.error_remove_page = generic_error_remove_page,\n"
- "> \302\240};\n"
+ "> A #endif\n"
+ "> A \t.error_remove_page = generic_error_remove_page,\n"
+ "> A };\n"
  "-- \n"
  "Joonas Lahtinen\n"
  "Open Source Technology Center\n"
  "Intel Corporation\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ "\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>"
 
-6a2dd2bc980632ac6d3294e1ac32245bcf23526973b17c1fb14b3d812e4f5ffb
+b9146322d666a81f8682a6e86639a9be6b3b9cce91ff45060a0320448756c574
