diff for duplicates of <1463765696.3005.2.camel@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 267605d..05bc189 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,17 +1,32 @@
-T24gRnJpLCAyMDE2LTA1LTIwIGF0IDE0OjUwICswMDAwLCBLYW5pLCBUb3NoaW1pdHN1IHdyb3Rl
-Og0KPiBPbiBUaHUsIDIwMTYtMDUtMTkgYXQgMTg6MzcgLTA1MDAsIEVyaWMgU2FuZGVlbiB3cm90
-ZToNCj4gPiANCj4gPiBPbiA1LzEwLzE2IDExOjIzIEFNLCBUb3NoaSBLYW5pIHdyb3RlOg0KPiA+
-ID4gDQo+ID4gPiANCj4gPiA+IFdoZW4gYSBwYXJ0aXRpb24gaXMgbm90IGFsaWduZWQgYnkgNEtC
-LCBtb3VudCAtbyBkYXggc3VjY2VlZHMsDQo+ID4gU29ycnkgZm9yIGJlaW5nIGxhdGUsIGJ1dCAt
-DQo+ID4gDQo+ID4gU2hvdWxkbid0IHRoaXMgYW5kIGFsbCBzdWJzZXF1ZW50IHBhdGNoIGNvbW1p
-dHMgcmVmZXIgdG8NCj4gPiBQQUdFX1NJWkUsIHJhdGhlciB0aGFuICI0a0I/Ig0KPiBSaWdodCwg
-dGhlIHBhdGNoIGNvbW1pdHMgc2hvdWxkIHJlZmVyIHRvIFBBR0VfU0laRSB0byBtYXRjaCB3aXRo
-IHRoZQ0KPiBjb2RlDQo+IGNoYW5nZXMuwqDCoEkgYW0gYWZyYWlkIGl0IG1heSBiZSBhIGJpdCB0
-b28gbGF0ZSB0byB1cGRhdGUsIHRob3VnaC4uLg0KPiANCj4gVmlzaGFsLCBkbyB5b3UgdGhpbmsg
-eW91IGNhbiB0d2VhayB0aGUgbG9ncywgIjRLQiIgdG8gIlBBR0VfU0laRSI/DQo+IA0KPiBUaGFu
-a3MsDQo+IC1Ub3NoaQ0KDQpIaSBUb3NoaSwNCg0KSXMgaXQganVzdCBjb21taXQgbWVzc2FnZSBj
-aGFuZ2VzPyBJZiBzbyBJJ20gbm90IHN1cmUgaXQgaXMgd29ydGh3aGlsZQ0KdG8gcmViYXNlIGV2
-ZXJ5dGhpbmcgZm9yIHRoYXQgLSBpLmUuIG15IGRheCBlcnJvciBoYW5kbGluZyBzZXJpZXMgYW5k
-DQpSb3NzJyBkYXgtbG9ja2luZyBicmFuY2ggd291bGQgYm90aCBoYXZlIHRvIGJlIHJlYmFzZWQu
-Lg0KDQpJZiB0aGVyZSBhcmUgYW5kIGZpeGVzIGZvciBjb2RlLCB3ZSBjYW4gZG8gdGhlbSBhcyBh
-biBhZGQtb24gcGF0Y2gNCnRob3VnaC4=
+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.
+_______________________________________________
+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 4334fb6..4956374 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,35 +11,48 @@
   jack@suse.cz <jack@suse.cz>
   sandeen@sandeen.net <sandeen@sandeen.net>
  " david@fromorbit.com <david@fromorbit.com>\0"
- "Cc\0micah.parrish@hpe.com <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>
+  micah.parrish@hpe.com <micah.parrish@hpe.com>
   linux-block@vger.kernel.org <linux-block@vger.kernel.org>
-  hch@infradead.org <hch@infradead.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"
- "T24gRnJpLCAyMDE2LTA1LTIwIGF0IDE0OjUwICswMDAwLCBLYW5pLCBUb3NoaW1pdHN1IHdyb3Rl\n"
- "Og0KPiBPbiBUaHUsIDIwMTYtMDUtMTkgYXQgMTg6MzcgLTA1MDAsIEVyaWMgU2FuZGVlbiB3cm90\n"
- "ZToNCj4gPiANCj4gPiBPbiA1LzEwLzE2IDExOjIzIEFNLCBUb3NoaSBLYW5pIHdyb3RlOg0KPiA+\n"
- "ID4gDQo+ID4gPiANCj4gPiA+IFdoZW4gYSBwYXJ0aXRpb24gaXMgbm90IGFsaWduZWQgYnkgNEtC\n"
- "LCBtb3VudCAtbyBkYXggc3VjY2VlZHMsDQo+ID4gU29ycnkgZm9yIGJlaW5nIGxhdGUsIGJ1dCAt\n"
- "DQo+ID4gDQo+ID4gU2hvdWxkbid0IHRoaXMgYW5kIGFsbCBzdWJzZXF1ZW50IHBhdGNoIGNvbW1p\n"
- "dHMgcmVmZXIgdG8NCj4gPiBQQUdFX1NJWkUsIHJhdGhlciB0aGFuICI0a0I/Ig0KPiBSaWdodCwg\n"
- "dGhlIHBhdGNoIGNvbW1pdHMgc2hvdWxkIHJlZmVyIHRvIFBBR0VfU0laRSB0byBtYXRjaCB3aXRo\n"
- "IHRoZQ0KPiBjb2RlDQo+IGNoYW5nZXMuwqDCoEkgYW0gYWZyYWlkIGl0IG1heSBiZSBhIGJpdCB0\n"
- "b28gbGF0ZSB0byB1cGRhdGUsIHRob3VnaC4uLg0KPiANCj4gVmlzaGFsLCBkbyB5b3UgdGhpbmsg\n"
- "eW91IGNhbiB0d2VhayB0aGUgbG9ncywgIjRLQiIgdG8gIlBBR0VfU0laRSI/DQo+IA0KPiBUaGFu\n"
- "a3MsDQo+IC1Ub3NoaQ0KDQpIaSBUb3NoaSwNCg0KSXMgaXQganVzdCBjb21taXQgbWVzc2FnZSBj\n"
- "aGFuZ2VzPyBJZiBzbyBJJ20gbm90IHN1cmUgaXQgaXMgd29ydGh3aGlsZQ0KdG8gcmViYXNlIGV2\n"
- "ZXJ5dGhpbmcgZm9yIHRoYXQgLSBpLmUuIG15IGRheCBlcnJvciBoYW5kbGluZyBzZXJpZXMgYW5k\n"
- "DQpSb3NzJyBkYXgtbG9ja2luZyBicmFuY2ggd291bGQgYm90aCBoYXZlIHRvIGJlIHJlYmFzZWQu\n"
- "Lg0KDQpJZiB0aGVyZSBhcmUgYW5kIGZpeGVzIGZvciBjb2RlLCB3ZSBjYW4gZG8gdGhlbSBhcyBh\n"
- biBhZGQtb24gcGF0Y2gNCnRob3VnaC4=
+ "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"
+ "> > \n"
+ "> > On 5/10/16 11:23 AM, Toshi Kani wrote:\n"
+ "> > > \n"
+ "> > > \n"
+ "> > > When a partition is not aligned by 4KB, mount -o dax succeeds,\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"
+ "> Right, the patch commits should refer to PAGE_SIZE to match with the\n"
+ "> code\n"
+ "> changes.\302\240\302\240I am afraid it may be a bit too late to update, 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"
+ "Linux-nvdimm mailing list\n"
+ "Linux-nvdimm@lists.01.org\n"
+ https://lists.01.org/mailman/listinfo/linux-nvdimm
 
-aaadaf287274785d107effd398092952da653b72dc8d354cea36e014c98e7fba
+360fa65865d68132882e6490ce8b1b5f3518d899f02067efef5c3de029d2c62e
