diff for duplicates of <1463766042.32042.34.camel@hpe.com>

diff --git a/a/1.txt b/N1/1.txt
index 57181a8..28a88f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,21 +1,40 @@
-T24gRnJpLCAyMDE2LTA1LTIwIGF0IDE3OjM0ICswMDAwLCBWZXJtYSwgVmlzaGFsIEwgd3JvdGU6
-DQo+IE9uIEZyaSwgMjAxNi0wNS0yMCBhdCAxNDo1MCArMDAwMCwgS2FuaSwgVG9zaGltaXRzdSB3
-cm90ZToNCj4gPiBPbiBUaHUsIDIwMTYtMDUtMTkgYXQgMTg6MzcgLTA1MDAsIEVyaWMgU2FuZGVl
-biB3cm90ZToNCj4gPiA+IE9uIDUvMTAvMTYgMTE6MjMgQU0sIFRvc2hpIEthbmkgd3JvdGU6DQo+
-ID4gPiA+wqANCj4gPiA+ID4gV2hlbiBhIHBhcnRpdGlvbiBpcyBub3QgYWxpZ25lZCBieSA0S0Is
-IG1vdW50IC1vIGRheCBzdWNjZWVkcywNCj4gPiA+DQo+ID4gPiBTb3JyeSBmb3IgYmVpbmcgbGF0
-ZSwgYnV0IC0NCj4gPiA+IA0KPiA+ID4gU2hvdWxkbid0IHRoaXMgYW5kIGFsbCBzdWJzZXF1ZW50
-IHBhdGNoIGNvbW1pdHMgcmVmZXIgdG8NCj4gPiA+IFBBR0VfU0laRSwgcmF0aGVyIHRoYW4gIjRr
-Qj8iDQo+ID4NCj4gPiBSaWdodCwgdGhlIHBhdGNoIGNvbW1pdHMgc2hvdWxkIHJlZmVyIHRvIFBB
-R0VfU0laRSB0byBtYXRjaCB3aXRoIHRoZQ0KPiA+IGNvZGUgY2hhbmdlcy7CoMKgSSBhbSBhZnJh
-aWQgaXQgbWF5IGJlIGEgYml0IHRvbyBsYXRlIHRvIHVwZGF0ZSwNCj4gPiB0aG91Z2guLi4NCj4g
-PiANCj4gPiBWaXNoYWwsIGRvIHlvdSB0aGluayB5b3UgY2FuIHR3ZWFrIHRoZSBsb2dzLCAiNEtC
-IiB0byAiUEFHRV9TSVpFIj8NCj4gPiANCj4gPiBUaGFua3MsDQo+ID4gLVRvc2hpDQo+DQo+IEhp
-IFRvc2hpLA0KPiANCj4gSXMgaXQganVzdCBjb21taXQgbWVzc2FnZSBjaGFuZ2VzPyBJZiBzbyBJ
-J20gbm90IHN1cmUgaXQgaXMgd29ydGh3aGlsZQ0KPiB0byByZWJhc2UgZXZlcnl0aGluZyBmb3Ig
-dGhhdCAtIGkuZS4gbXkgZGF4IGVycm9yIGhhbmRsaW5nIHNlcmllcyBhbmQNCj4gUm9zcycgZGF4
-LWxvY2tpbmcgYnJhbmNoIHdvdWxkIGJvdGggaGF2ZSB0byBiZSByZWJhc2VkLi4NCj4gDQo+IElm
-IHRoZXJlIGFyZSBhbmQgZml4ZXMgZm9yIGNvZGUsIHdlIGNhbiBkbyB0aGVtIGFzIGFuIGFkZC1v
-biBwYXRjaA0KPiB0aG91Z2guDQoNCkhpIFZpc2hhbCwNCg0KWWVzLCBpdCBpcyBqdXN0IGNvbW1p
-dCBtZXNzYWdlcywgYW5kIGl0J3MgT0sgbm90IHRvIG1ha2UgdGhpcyBjaGFuZ2UuDQoNClRoYW5r
-cywNCi1Ub3NoaQ==
+On Fri, 2016-05-20 at 17:34 +0000, Verma, Vishal L wrote:
+> On Fri, 2016-05-20 at 14:50 +0000, Kani, Toshimitsu wrote:
+> > On Thu, 2016-05-19 at 18:37 -0500, Eric Sandeen wrote:
+> > > On 5/10/16 11:23 AM, Toshi Kani wrote:
+> > > > 
+> > > > When a partition is not aligned by 4KB, mount -o dax succeeds,
+> > >
+> > > Sorry for being late, but -
+> > > 
+> > > Shouldn't this and all subsequent patch commits refer to
+> > > PAGE_SIZE, rather than "4kB?"
+> >
+> > Right, the patch commits should refer to PAGE_SIZE to match with the
+> > code changes.  I am afraid it may be a bit too late to update,
+> > though...
+> > 
+> > Vishal, do you think you can tweak the logs, "4KB" to "PAGE_SIZE"?
+> > 
+> > Thanks,
+> > -Toshi
+>
+> Hi Toshi,
+> 
+> Is it just commit message changes? If so I'm not sure it is worthwhile
+> to rebase everything for that - i.e. my dax error handling series and
+> Ross' dax-locking branch would both have to be rebased..
+> 
+> If there are and fixes for code, we can do them as an add-on patch
+> though.
+
+Hi Vishal,
+
+Yes, it is just commit messages, and it's OK not to make this change.
+
+Thanks,
+-Toshi
+_______________________________________________
+Linux-nvdimm mailing list
+Linux-nvdimm@lists.01.org
+https://lists.01.org/mailman/listinfo/linux-nvdimm
diff --git a/a/content_digest b/N1/content_digest
index 77bb16a..69bf7cb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,40 +11,57 @@
   david@fromorbit.com <david@fromorbit.com>
   sandeen@sandeen.net <sandeen@sandeen.net>
  " vishal.l.verma@intel.com <vishal.l.verma@intel.com>\0"
- "Cc\0Parrish"
-  Micah (HP Servers Linux R&D) <micah.parrish@hpe.com>
+ "Cc\0hch@infradead.org <hch@infradead.org>"
+  tytso@mit.edu <tytso@mit.edu>
+  linux-nvdimm@lists.01.org <linux-nvdimm@lists.01.org>
+  axboe@fb.com <axboe@fb.com>
   linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
-  linux-block@vger.kernel.org <linux-block@vger.kernel.org>
-  hch@infradead.org <hch@infradead.org>
+  Parrish
+ " Micah \\\\ linux-block@vger.kernel.org (HP Servers Linux R&D)\\ <micah.parrish@hpe.com>"
+ ) <linux-block@vger.kernel.org>
   adilger.kernel@dilger.ca <adilger.kernel@dilger.ca>
-  axboe@fb.com <axboe@fb.com>
-  linux-nvdimm@lists.01.org <linux-nvdimm@lists.01.org>
-  linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>
-  ross.zwisler@linux.intel.com <ross.zwisler@linux.intel.com>
-  tytso@mit.edu <tytso@mit.edu>
- " boaz@plexistor.com <boaz@plexistor.com>\0"
+ " linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
- "T24gRnJpLCAyMDE2LTA1LTIwIGF0IDE3OjM0ICswMDAwLCBWZXJtYSwgVmlzaGFsIEwgd3JvdGU6\n"
- "DQo+IE9uIEZyaSwgMjAxNi0wNS0yMCBhdCAxNDo1MCArMDAwMCwgS2FuaSwgVG9zaGltaXRzdSB3\n"
- "cm90ZToNCj4gPiBPbiBUaHUsIDIwMTYtMDUtMTkgYXQgMTg6MzcgLTA1MDAsIEVyaWMgU2FuZGVl\n"
- "biB3cm90ZToNCj4gPiA+IE9uIDUvMTAvMTYgMTE6MjMgQU0sIFRvc2hpIEthbmkgd3JvdGU6DQo+\n"
- "ID4gPiA+wqANCj4gPiA+ID4gV2hlbiBhIHBhcnRpdGlvbiBpcyBub3QgYWxpZ25lZCBieSA0S0Is\n"
- "IG1vdW50IC1vIGRheCBzdWNjZWVkcywNCj4gPiA+DQo+ID4gPiBTb3JyeSBmb3IgYmVpbmcgbGF0\n"
- "ZSwgYnV0IC0NCj4gPiA+IA0KPiA+ID4gU2hvdWxkbid0IHRoaXMgYW5kIGFsbCBzdWJzZXF1ZW50\n"
- "IHBhdGNoIGNvbW1pdHMgcmVmZXIgdG8NCj4gPiA+IFBBR0VfU0laRSwgcmF0aGVyIHRoYW4gIjRr\n"
- "Qj8iDQo+ID4NCj4gPiBSaWdodCwgdGhlIHBhdGNoIGNvbW1pdHMgc2hvdWxkIHJlZmVyIHRvIFBB\n"
- "R0VfU0laRSB0byBtYXRjaCB3aXRoIHRoZQ0KPiA+IGNvZGUgY2hhbmdlcy7CoMKgSSBhbSBhZnJh\n"
- "aWQgaXQgbWF5IGJlIGEgYml0IHRvbyBsYXRlIHRvIHVwZGF0ZSwNCj4gPiB0aG91Z2guLi4NCj4g\n"
- "PiANCj4gPiBWaXNoYWwsIGRvIHlvdSB0aGluayB5b3UgY2FuIHR3ZWFrIHRoZSBsb2dzLCAiNEtC\n"
- "IiB0byAiUEFHRV9TSVpFIj8NCj4gPiANCj4gPiBUaGFua3MsDQo+ID4gLVRvc2hpDQo+DQo+IEhp\n"
- "IFRvc2hpLA0KPiANCj4gSXMgaXQganVzdCBjb21taXQgbWVzc2FnZSBjaGFuZ2VzPyBJZiBzbyBJ\n"
- "J20gbm90IHN1cmUgaXQgaXMgd29ydGh3aGlsZQ0KPiB0byByZWJhc2UgZXZlcnl0aGluZyBmb3Ig\n"
- "dGhhdCAtIGkuZS4gbXkgZGF4IGVycm9yIGhhbmRsaW5nIHNlcmllcyBhbmQNCj4gUm9zcycgZGF4\n"
- "LWxvY2tpbmcgYnJhbmNoIHdvdWxkIGJvdGggaGF2ZSB0byBiZSByZWJhc2VkLi4NCj4gDQo+IElm\n"
- "IHRoZXJlIGFyZSBhbmQgZml4ZXMgZm9yIGNvZGUsIHdlIGNhbiBkbyB0aGVtIGFzIGFuIGFkZC1v\n"
- "biBwYXRjaA0KPiB0aG91Z2guDQoNCkhpIFZpc2hhbCwNCg0KWWVzLCBpdCBpcyBqdXN0IGNvbW1p\n"
- "dCBtZXNzYWdlcywgYW5kIGl0J3MgT0sgbm90IHRvIG1ha2UgdGhpcyBjaGFuZ2UuDQoNClRoYW5r\n"
- cywNCi1Ub3NoaQ==
+ "On Fri, 2016-05-20 at 17:34 +0000, Verma, Vishal L wrote:\n"
+ "> On Fri, 2016-05-20 at 14:50 +0000, Kani, Toshimitsu wrote:\n"
+ "> > On Thu, 2016-05-19 at 18:37 -0500, Eric Sandeen wrote:\n"
+ "> > > On 5/10/16 11:23 AM, Toshi Kani wrote:\n"
+ "> > > >\302\240\n"
+ "> > > > When a partition is not aligned by 4KB, mount -o dax succeeds,\n"
+ "> > >\n"
+ "> > > Sorry for being late, but -\n"
+ "> > > \n"
+ "> > > Shouldn't this and all subsequent patch commits refer to\n"
+ "> > > PAGE_SIZE, rather than \"4kB?\"\n"
+ "> >\n"
+ "> > Right, the patch commits should refer to PAGE_SIZE to match with the\n"
+ "> > code changes.\302\240\302\240I am afraid it may be a bit too late to update,\n"
+ "> > though...\n"
+ "> > \n"
+ "> > Vishal, do you think you can tweak the logs, \"4KB\" to \"PAGE_SIZE\"?\n"
+ "> > \n"
+ "> > Thanks,\n"
+ "> > -Toshi\n"
+ ">\n"
+ "> Hi Toshi,\n"
+ "> \n"
+ "> Is it just commit message changes? If so I'm not sure it is worthwhile\n"
+ "> to rebase everything for that - i.e. my dax error handling series and\n"
+ "> Ross' dax-locking branch would both have to be rebased..\n"
+ "> \n"
+ "> If there are and fixes for code, we can do them as an add-on patch\n"
+ "> though.\n"
+ "\n"
+ "Hi Vishal,\n"
+ "\n"
+ "Yes, it is just commit messages, and it's OK not to make this change.\n"
+ "\n"
+ "Thanks,\n"
+ "-Toshi\n"
+ "_______________________________________________\n"
+ "Linux-nvdimm mailing list\n"
+ "Linux-nvdimm@lists.01.org\n"
+ https://lists.01.org/mailman/listinfo/linux-nvdimm
 
-13335b0302eab2bc8c7d3de5f0ee691fc2e10935ed060c8db7076280a5b31447
+c82be831e85a4a39625a30b4e361516e4130c624264ae1153bdd91ba070d44cc
