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

diff --git a/a/1.txt b/N1/1.txt
index 2af45e3..4e6c765 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,19 +1,28 @@
-T24gU3VuLCAyMDE2LTA1LTA4IGF0IDAxOjUyIC0wNzAwLCBDaHJpc3RvcGggSGVsbHdpZyB3cm90
-ZToNCj4gT24gRnJpLCBNYXkgMDYsIDIwMTYgYXQgMDM6NTM6MDlQTSAtMDYwMCwgVmlzaGFsIFZl
-cm1hIHdyb3RlOg0KPiA+IA0KPiA+IEZyb206IE1hdHRoZXcgV2lsY294IDxtYXR0aGV3LnIud2ls
-Y294QGludGVsLmNvbT4NCj4gPiANCj4gPiBkYXhfY2xlYXJfc2VjdG9ycygpIGNhbm5vdCBoYW5k
-bGUgcG9pc29uZWQgYmxvY2tzLsKgwqBUaGVzZSBtdXN0IGJlDQo+ID4gemVyb2VkIHVzaW5nIHRo
-ZSBCSU8gaW50ZXJmYWNlIGluc3RlYWQuwqDCoENvbnZlcnQgZXh0MiBhbmQgWEZTIHRvDQo+ID4g
-dXNlDQo+ID4gb25seSBzYl9pc3N1ZV96ZXJvdXQoKS4NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5
-OiBNYXR0aGV3IFdpbGNveCA8bWF0dGhldy5yLndpbGNveEBpbnRlbC5jb20+DQo+ID4gW3Zpc2hh
-bDogQWxzbyByZW1vdmUgdGhlIGRheF9jbGVhcl9zZWN0b3JzIGZ1bmN0aW9uIGVudGlyZWx5XQ0K
-PiA+IFNpZ25lZC1vZmYtYnk6IFZpc2hhbCBWZXJtYSA8dmlzaGFsLmwudmVybWFAaW50ZWwuY29t
-Pg0KPiBKdXN0IHRvIG1ha2Ugc3VyZTrCoMKgdGhlIGV4aXN0aW5nIHNiX2lzc3VlX3plcm91dCBh
-cyBpbiA0LjYtcmMNCj4gaXMgYWxyZWFkeSBkb2luZyB0aGUgcmlnaHQgdGhpbmcgZm9yIERBWD/C
-oMKgSSd2ZSBnb3QgYSBwZW5kaW5nDQo+IHBhdGNoc2V0DQo+IGZvciBYRlMgdGhhdCBpbnRyb2R1
-Y2VzIGFub3RoZXIgZGF4X2NsZWFyX3NlY3RvcnMgdXNlcnMsIGJ1dCBpZiBpdCdzDQo+IGFscmVh
-ZHkgc2FmZSB0byB1c2UgYmxrZGV2X2lzc3VlX3plcm9vdXQgSSBjYW4gc3dpdGNoIHRvIHRoYXQg
-YW5kDQo+IGF2b2lkDQo+IHRoZSBtZXJnZSBjb25mbGljdC4NCg0KSSBiZWxpZXZlIHNvIC0gSmFu
-IGhhcyBtb3ZlZCBhbGwgdW53cml0dGVuIGV4dGVudCBjb252ZXJzaW9ucyBvdXQgb2YNCkRBWCB3
-aXRoIGhpcyBwYXRjaCBzZXQsIGFuZCBJIGJlbGlldmUgemVyb2luZyB0aHJvdWdoIHRoZSBkcml2
-ZXIgaXMNCmFsd2F5cyBmaW5lLiBSb3NzIG9yIEphbiBjb3VsZCBjb25maXJtIHRob3VnaC7CoA==
+On Sun, 2016-05-08 at 01:52 -0700, Christoph Hellwig wrote:
+> On Fri, May 06, 2016 at 03:53:09PM -0600, Vishal Verma wrote:
+> > 
+> > From: Matthew Wilcox <matthew.r.wilcox@intel.com>
+> > 
+> > dax_clear_sectors() cannot handle poisoned blocks.  These must be
+> > zeroed using the BIO interface instead.  Convert ext2 and XFS to
+> > use
+> > only sb_issue_zerout().
+> > 
+> > Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
+> > [vishal: Also remove the dax_clear_sectors function entirely]
+> > Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
+> Just to make sure:  the existing sb_issue_zerout as in 4.6-rc
+> is already doing the right thing for DAX?  I've got a pending
+> patchset
+> for XFS that introduces another dax_clear_sectors users, but if it's
+> already safe to use blkdev_issue_zeroout I can switch to that and
+> avoid
+> the merge conflict.
+
+I believe so - Jan has moved all unwritten extent conversions out of
+DAX with his patch set, and I believe zeroing through the driver is
+always fine. Ross or Jan could confirm though. 
+_______________________________________________
+xfs mailing list
+xfs@oss.sgi.com
+http://oss.sgi.com/mailman/listinfo/xfs
diff --git a/a/content_digest b/N1/content_digest
index 1cd4d65..bbf95b6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,44 +5,52 @@
  "Subject\0Re: [PATCH v5 3/5] dax: use sb_issue_zerout instead of calling dax_clear_sectors\0"
  "Date\0Sun, 8 May 2016 18:46:13 +0000\0"
  "To\0hch@infradead.org <hch@infradead.org>\0"
- "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>"
-  linux-block@vger.kernel.org <linux-block@vger.kernel.org>
-  xfs@oss.sgi.com <xfs@oss.sgi.com>
+ "Cc\0axboe@fb.com <axboe@fb.com>"
+  jack@suse.cz <jack@suse.cz>
+  boaz@plexistor.com <boaz@plexistor.com>
   linux-nvdimm@ml01.01.org <linux-nvdimm@ml01.01.org>
-  jmoyer@redhat.com <jmoyer@redhat.com>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  xfs@oss.sgi.com <xfs@oss.sgi.com>
+  linux-block@vger.kernel.org <linux-block@vger.kernel.org>
   linux-mm@kvack.org <linux-mm@kvack.org>
+  jmoyer@redhat.com <jmoyer@redhat.com>
+  Wilcox
+  Matthew R <matthew.r.wilcox@intel.com>
+  ross.zwisler@linux.intel.com <ross.zwisler@linux.intel.com>
+  linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>
   Williams
   Dan J <dan.j.williams@intel.com>
-  axboe@fb.com <axboe@fb.com>
-  akpm@linux-foundation.org <akpm@linux-foundation.org>
-  linux-fsdevel@vger.kernel.org <linux-fsdevel@vger.kernel.org>
-  ross.zwisler@linux.intel.com <ross.zwisler@linux.intel.com>
   linux-ext4@vger.kernel.org <linux-ext4@vger.kernel.org>
-  boaz@plexistor.com <boaz@plexistor.com>
-  Wilcox
-  Matthew R <matthew.r.wilcox@intel.com>
-  david@fromorbit.com <david@fromorbit.com>
- " jack@suse.cz <jack@suse.cz>\0"
+ " akpm@linux-foundation.org <akpm@linux-foundation.org>\0"
  "\00:1\0"
  "b\0"
- "T24gU3VuLCAyMDE2LTA1LTA4IGF0IDAxOjUyIC0wNzAwLCBDaHJpc3RvcGggSGVsbHdpZyB3cm90\n"
- "ZToNCj4gT24gRnJpLCBNYXkgMDYsIDIwMTYgYXQgMDM6NTM6MDlQTSAtMDYwMCwgVmlzaGFsIFZl\n"
- "cm1hIHdyb3RlOg0KPiA+IA0KPiA+IEZyb206IE1hdHRoZXcgV2lsY294IDxtYXR0aGV3LnIud2ls\n"
- "Y294QGludGVsLmNvbT4NCj4gPiANCj4gPiBkYXhfY2xlYXJfc2VjdG9ycygpIGNhbm5vdCBoYW5k\n"
- "bGUgcG9pc29uZWQgYmxvY2tzLsKgwqBUaGVzZSBtdXN0IGJlDQo+ID4gemVyb2VkIHVzaW5nIHRo\n"
- "ZSBCSU8gaW50ZXJmYWNlIGluc3RlYWQuwqDCoENvbnZlcnQgZXh0MiBhbmQgWEZTIHRvDQo+ID4g\n"
- "dXNlDQo+ID4gb25seSBzYl9pc3N1ZV96ZXJvdXQoKS4NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5\n"
- "OiBNYXR0aGV3IFdpbGNveCA8bWF0dGhldy5yLndpbGNveEBpbnRlbC5jb20+DQo+ID4gW3Zpc2hh\n"
- "bDogQWxzbyByZW1vdmUgdGhlIGRheF9jbGVhcl9zZWN0b3JzIGZ1bmN0aW9uIGVudGlyZWx5XQ0K\n"
- "PiA+IFNpZ25lZC1vZmYtYnk6IFZpc2hhbCBWZXJtYSA8dmlzaGFsLmwudmVybWFAaW50ZWwuY29t\n"
- "Pg0KPiBKdXN0IHRvIG1ha2Ugc3VyZTrCoMKgdGhlIGV4aXN0aW5nIHNiX2lzc3VlX3plcm91dCBh\n"
- "cyBpbiA0LjYtcmMNCj4gaXMgYWxyZWFkeSBkb2luZyB0aGUgcmlnaHQgdGhpbmcgZm9yIERBWD/C\n"
- "oMKgSSd2ZSBnb3QgYSBwZW5kaW5nDQo+IHBhdGNoc2V0DQo+IGZvciBYRlMgdGhhdCBpbnRyb2R1\n"
- "Y2VzIGFub3RoZXIgZGF4X2NsZWFyX3NlY3RvcnMgdXNlcnMsIGJ1dCBpZiBpdCdzDQo+IGFscmVh\n"
- "ZHkgc2FmZSB0byB1c2UgYmxrZGV2X2lzc3VlX3plcm9vdXQgSSBjYW4gc3dpdGNoIHRvIHRoYXQg\n"
- "YW5kDQo+IGF2b2lkDQo+IHRoZSBtZXJnZSBjb25mbGljdC4NCg0KSSBiZWxpZXZlIHNvIC0gSmFu\n"
- "IGhhcyBtb3ZlZCBhbGwgdW53cml0dGVuIGV4dGVudCBjb252ZXJzaW9ucyBvdXQgb2YNCkRBWCB3\n"
- "aXRoIGhpcyBwYXRjaCBzZXQsIGFuZCBJIGJlbGlldmUgemVyb2luZyB0aHJvdWdoIHRoZSBkcml2\n"
- ZXIgaXMNCmFsd2F5cyBmaW5lLiBSb3NzIG9yIEphbiBjb3VsZCBjb25maXJtIHRob3VnaC7CoA==
+ "On Sun, 2016-05-08 at 01:52 -0700, Christoph Hellwig wrote:\n"
+ "> On Fri, May 06, 2016 at 03:53:09PM -0600, Vishal Verma wrote:\n"
+ "> > \n"
+ "> > From: Matthew Wilcox <matthew.r.wilcox@intel.com>\n"
+ "> > \n"
+ "> > dax_clear_sectors() cannot handle poisoned blocks.\302\240\302\240These must be\n"
+ "> > zeroed using the BIO interface instead.\302\240\302\240Convert ext2 and XFS to\n"
+ "> > use\n"
+ "> > only sb_issue_zerout().\n"
+ "> > \n"
+ "> > Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>\n"
+ "> > [vishal: Also remove the dax_clear_sectors function entirely]\n"
+ "> > Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>\n"
+ "> Just to make sure:\302\240\302\240the existing sb_issue_zerout as in 4.6-rc\n"
+ "> is already doing the right thing for DAX?\302\240\302\240I've got a pending\n"
+ "> patchset\n"
+ "> for XFS that introduces another dax_clear_sectors users, but if it's\n"
+ "> already safe to use blkdev_issue_zeroout I can switch to that and\n"
+ "> avoid\n"
+ "> the merge conflict.\n"
+ "\n"
+ "I believe so - Jan has moved all unwritten extent conversions out of\n"
+ "DAX with his patch set, and I believe zeroing through the driver is\n"
+ "always fine. Ross or Jan could confirm though.\302\240\n"
+ "_______________________________________________\n"
+ "xfs mailing list\n"
+ "xfs@oss.sgi.com\n"
+ http://oss.sgi.com/mailman/listinfo/xfs
 
-682802f1aa7d196ccfec3dd227b3080349b4bf9737251e7f688468b58eed84d7
+f4bc3b24fb0de376cb1db019168845af08365bbfc34c847ca0450c15abd617b3
