diff for duplicates of <20161117161001.GA13836@sbauer-Z170X-UD5>

diff --git a/a/1.txt b/N1/1.txt
index e303fc7..cd9e834 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,48 +1,32 @@
-On Thu, Nov 17, 2016 at 07:22:15AM -0800, Christoph Hellwig wrote:
+On Thu, Nov 17, 2016@07:22:15AM -0800, Christoph Hellwig wrote:
 > > @@ -0,0 +1,58 @@
 > > +/*
-> > + * Copyright =A9 2016 Intel Corporation
+> > + * Copyright ? 2016 Intel Corporation
 > > + *
-> > + * Permission is hereby granted, free of charge, to any person obtaini=
-ng a
-> > + * copy of this software and associated documentation files (the "Soft=
-ware"),
-> > + * to deal in the Software without restriction, including without limi=
-tation
-> > + * the rights to use, copy, modify, merge, publish, distribute, sublic=
-ense,
-> > + * and/or sell copies of the Software, and to permit persons to whom t=
-he
+> > + * Permission is hereby granted, free of charge, to any person obtaining a
+> > + * copy of this software and associated documentation files (the "Software"),
+> > + * to deal in the Software without restriction, including without limitation
+> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+> > + * and/or sell copies of the Software, and to permit persons to whom the
 > > + * Software is furnished to do so, subject to the following conditions:
 > > + *
-> > + * The above copyright notice and this permission notice (including th=
-e next
-> > + * paragraph) shall be included in all copies or substantial portions =
-of the
+> > + * The above copyright notice and this permission notice (including the next
+> > + * paragraph) shall be included in all copies or substantial portions of the
 > > + * Software.
 > > + *
-> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXP=
-RESS OR
-> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABI=
-LITY,
-> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT =
-SHALL
-> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES O=
-R OTHER
-> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARI=
-SING
-> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER=
- DEALINGS
-> =
-
+> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+> 
 > Can we get a proper GPLv2/GPLv2 license for this from the Intel
 > layers?  While the license grant looks fine from a quick look I'd really
 > prefer to have an official statement that this should be compatible
 > with the kernel licensing.
-> =
-
-Sure, I will send them some mail to see if we can change them to something =
-else.
+> 
+Sure, I will send them some mail to see if we can change them to something else.
 
 
 > > +#define LINUX_OPAL_H
@@ -51,20 +35,17 @@ else.
 > > +#include <linux/kernel.h>
 > > +
 > > +enum {
-> > +	TCG_SECP_00 =3D 0,
+> > +	TCG_SECP_00 = 0,
 > > +	TCG_SECP_01,
 > > +};
-> =
-
+> 
 > These are the SPC4 security protocol defintions, aren't they?
 > Can you please add a separate include/scsi/sec_protocol.h header that
 > defines just these and documents where they come from?
-> =
-
+> 
 > Similarly for all the other constants it would be nice to refer to
 > the spec they are from in the header.
- =
-
+ 
 Sure I can specify what spec/location they're pulled from.
 
 > > +struct sec_ops {
@@ -74,15 +55,7 @@ Sure I can specify what spec/location they're pulled from.
 > > +	int (*recv)(void *data, __u16 SPSP, __u8 SECP,
 > > +			void *buffer, size_t len,
 > > +			sec_cb *cb, void *cb_data);
-> =
-
+> 
 > please use lower case names for all arguments and variables.
-I think we chose the uppercase because that's how it was in the specificati=
-on,
+I think we chose the uppercase because that's how it was in the specification,
 none the less we'll swap them up.
-
-
-_______________________________________________
-Linux-nvme mailing list
-Linux-nvme@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-nvme
diff --git a/a/content_digest b/N1/content_digest
index 15a1b99..3761108 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,65 +1,40 @@
  "ref\01479338252-8777-1-git-send-email-scott.bauer@intel.com\0"
  "ref\01479338252-8777-2-git-send-email-scott.bauer@intel.com\0"
  "ref\020161117152215.GA20335@infradead.org\0"
- "From\0Scott Bauer <scott.bauer@intel.com>\0"
- "Subject\0Re: [PATCH v1 1/7] Include: Add definitions for sed\0"
+ "From\0scott.bauer@intel.com (Scott Bauer)\0"
+ "Subject\0[PATCH v1 1/7] Include: Add definitions for sed\0"
  "Date\0Thu, 17 Nov 2016 09:10:02 -0700\0"
- "To\0Christoph Hellwig <hch@infradead.org>\0"
- "Cc\0linux-block@vger.kernel.org"
-  sagi@grimberg.me
-  Rafael.Antognolli@intel.com
-  axboe@fb.com
-  linux-nvme@lists.infradead.org
-  keith.busch@intel.com
-  jonathan.derrick@intel.com
- " j.naumann@fu-berlin.de\0"
  "\00:1\0"
  "b\0"
- "On Thu, Nov 17, 2016 at 07:22:15AM -0800, Christoph Hellwig wrote:\n"
+ "On Thu, Nov 17, 2016@07:22:15AM -0800, Christoph Hellwig wrote:\n"
  "> > @@ -0,0 +1,58 @@\n"
  "> > +/*\n"
- "> > + * Copyright =A9 2016 Intel Corporation\n"
+ "> > + * Copyright ? 2016 Intel Corporation\n"
  "> > + *\n"
- "> > + * Permission is hereby granted, free of charge, to any person obtaini=\n"
- "ng a\n"
- "> > + * copy of this software and associated documentation files (the \"Soft=\n"
- "ware\"),\n"
- "> > + * to deal in the Software without restriction, including without limi=\n"
- "tation\n"
- "> > + * the rights to use, copy, modify, merge, publish, distribute, sublic=\n"
- "ense,\n"
- "> > + * and/or sell copies of the Software, and to permit persons to whom t=\n"
- "he\n"
+ "> > + * Permission is hereby granted, free of charge, to any person obtaining a\n"
+ "> > + * copy of this software and associated documentation files (the \"Software\"),\n"
+ "> > + * to deal in the Software without restriction, including without limitation\n"
+ "> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,\n"
+ "> > + * and/or sell copies of the Software, and to permit persons to whom the\n"
  "> > + * Software is furnished to do so, subject to the following conditions:\n"
  "> > + *\n"
- "> > + * The above copyright notice and this permission notice (including th=\n"
- "e next\n"
- "> > + * paragraph) shall be included in all copies or substantial portions =\n"
- "of the\n"
+ "> > + * The above copyright notice and this permission notice (including the next\n"
+ "> > + * paragraph) shall be included in all copies or substantial portions of the\n"
  "> > + * Software.\n"
  "> > + *\n"
- "> > + * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXP=\n"
- "RESS OR\n"
- "> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABI=\n"
- "LITY,\n"
- "> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT =\n"
- "SHALL\n"
- "> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES O=\n"
- "R OTHER\n"
- "> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARI=\n"
- "SING\n"
- "> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER=\n"
- " DEALINGS\n"
- "> =\n"
- "\n"
+ "> > + * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
+ "> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+ "> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\n"
+ "> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
+ "> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n"
+ "> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS\n"
+ "> \n"
  "> Can we get a proper GPLv2/GPLv2 license for this from the Intel\n"
  "> layers?  While the license grant looks fine from a quick look I'd really\n"
  "> prefer to have an official statement that this should be compatible\n"
  "> with the kernel licensing.\n"
- "> =\n"
- "\n"
- "Sure, I will send them some mail to see if we can change them to something =\n"
- "else.\n"
+ "> \n"
+ "Sure, I will send them some mail to see if we can change them to something else.\n"
  "\n"
  "\n"
  "> > +#define LINUX_OPAL_H\n"
@@ -68,20 +43,17 @@
  "> > +#include <linux/kernel.h>\n"
  "> > +\n"
  "> > +enum {\n"
- "> > +\tTCG_SECP_00 =3D 0,\n"
+ "> > +\tTCG_SECP_00 = 0,\n"
  "> > +\tTCG_SECP_01,\n"
  "> > +};\n"
- "> =\n"
- "\n"
+ "> \n"
  "> These are the SPC4 security protocol defintions, aren't they?\n"
  "> Can you please add a separate include/scsi/sec_protocol.h header that\n"
  "> defines just these and documents where they come from?\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Similarly for all the other constants it would be nice to refer to\n"
  "> the spec they are from in the header.\n"
- " =\n"
- "\n"
+ " \n"
  "Sure I can specify what spec/location they're pulled from.\n"
  "\n"
  "> > +struct sec_ops {\n"
@@ -91,17 +63,9 @@
  "> > +\tint (*recv)(void *data, __u16 SPSP, __u8 SECP,\n"
  "> > +\t\t\tvoid *buffer, size_t len,\n"
  "> > +\t\t\tsec_cb *cb, void *cb_data);\n"
- "> =\n"
- "\n"
+ "> \n"
  "> please use lower case names for all arguments and variables.\n"
- "I think we chose the uppercase because that's how it was in the specificati=\n"
- "on,\n"
- "none the less we'll swap them up.\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Linux-nvme mailing list\n"
- "Linux-nvme@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-nvme
+ "I think we chose the uppercase because that's how it was in the specification,\n"
+ none the less we'll swap them up.
 
-587a6d7ff90975acc68c579b0e68df394855929dca01f6ee4f8c3741860f98d4
+33d145d146fa33bb115ffd5330dce4d32c0246c78a0c1bb38a6c4be09dfce94d
