diff for duplicates of <20200404174012.6d205fbc@collabora.com>

diff --git a/a/1.txt b/N1/1.txt
index d59f8a8..74f1eec 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -33,8 +33,3 @@ Thanks for the fix, and my apologies for the regression.
 >  obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o
 > +
 > +obj-$(CONFIG_MTD_SPI_NOR)	+= controllers/
-
-
-______________________________________________________
-Linux MTD discussion mailing list
-http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff --git a/a/content_digest b/N1/content_digest
index 2c9cd3c..64c8644 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,13 +3,13 @@
  "Subject\0Re: [PATCH] mtd: spi-nor: Compile files in controllers/ directory\0"
  "Date\0Sat, 4 Apr 2020 17:40:12 +0200\0"
  "To\0Guenter Roeck <linux@roeck-us.net>\0"
- "Cc\0Vignesh Raghavendra <vigneshr@ti.com>"
-  Tudor Ambarus <tudor.ambarus@microchip.com>
+ "Cc\0Tudor Ambarus <tudor.ambarus@microchip.com>"
+  Miquel Raynal <miquel.raynal@bootlin.com>
   Richard Weinberger <richard@nod.at>
-  Boris Brezillon <bbrezillon@kernel.org>
-  linux-kernel@vger.kernel.org
+  Vignesh Raghavendra <vigneshr@ti.com>
   linux-mtd@lists.infradead.org
- " Miquel Raynal <miquel.raynal@bootlin.com>\0"
+  linux-kernel@vger.kernel.org
+ " Boris Brezillon <bbrezillon@kernel.org>\0"
  "\00:1\0"
  "b\0"
  "On Sat,  4 Apr 2020 08:36:31 -0700\n"
@@ -46,11 +46,6 @@
  ">  spi-nor-objs\t\t\t+= xmc.o\n"
  ">  obj-$(CONFIG_MTD_SPI_NOR)\t+= spi-nor.o\n"
  "> +\n"
- "> +obj-$(CONFIG_MTD_SPI_NOR)\t+= controllers/\n"
- "\n"
- "\n"
- "______________________________________________________\n"
- "Linux MTD discussion mailing list\n"
- http://lists.infradead.org/mailman/listinfo/linux-mtd/
+ "> +obj-$(CONFIG_MTD_SPI_NOR)\t+= controllers/"
 
-2dba173c4b62834145676f93302ea13f70bd1993f3353990d91786f1ff97dd7c
+b06865f9ace0ddd67709f9d879cd537964604f03ed6c3e8d5e79852aad2688c4
