diff for duplicates of <8737g9ox1k.fsf@qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index 6483152..f2b0fd8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,34 +1,17 @@
-Joe Perches <joe@perches.com> writes:
-
-> On Mon, 2017-01-23 at 15:04 +0000, Srinivas Kandagatla wrote:
->> use dma_zalloc_coherent() instead of dma_alloc_coherent and memset().
-> []
->> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
-> []
->> @@ -896,7 +896,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,
->>  	 */
->>  	alloc_nbytes = min_t(unsigned int, nbytes, DIAG_TRANSFER_LIMIT);
->>  
->> -	data_buf = (unsigned char *)dma_alloc_coherent(ar->dev,
->> +	data_buf = (unsigned char *)dma_zalloc_coherent(ar->dev,
->>  						       alloc_nbytes,
->>  						       &ce_data_base,
->>  						       GFP_ATOMIC);
->
-> trivia:
->
-> Nicer to realign arguments and remove the unnecessary cast.
->
-> Perhaps:
->
-> 	data_buf = dma_zalloc_coherent(ar->dev, alloc_nbytes, &ce_data_base,
-> 				       GFP_ATOMIC);
-
-Sure, but that should be in a separate patch.
-
--- 
-Kalle Valo
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+Sm9lIFBlcmNoZXMgPGpvZUBwZXJjaGVzLmNvbT4gd3JpdGVzOg0KDQo+IE9uIE1vbiwgMjAxNy0w
+MS0yMyBhdCAxNTowNCArMDAwMCwgU3Jpbml2YXMgS2FuZGFnYXRsYSB3cm90ZToNCj4+IHVzZSBk
+bWFfemFsbG9jX2NvaGVyZW50KCkgaW5zdGVhZCBvZiBkbWFfYWxsb2NfY29oZXJlbnQgYW5kIG1l
+bXNldCgpLg0KPiBbXQ0KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9h
+dGgxMGsvcGNpLmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL3BjaS5jDQo+IFtd
+DQo+PiBAQCAtODk2LDcgKzg5Niw3IEBAIHN0YXRpYyBpbnQgYXRoMTBrX3BjaV9kaWFnX3JlYWRf
+bWVtKHN0cnVjdCBhdGgxMGsgKmFyLCB1MzIgYWRkcmVzcywgdm9pZCAqZGF0YSwNCj4+ICAJICov
+DQo+PiAgCWFsbG9jX25ieXRlcyA9IG1pbl90KHVuc2lnbmVkIGludCwgbmJ5dGVzLCBESUFHX1RS
+QU5TRkVSX0xJTUlUKTsNCj4+ICANCj4+IC0JZGF0YV9idWYgPSAodW5zaWduZWQgY2hhciAqKWRt
+YV9hbGxvY19jb2hlcmVudChhci0+ZGV2LA0KPj4gKwlkYXRhX2J1ZiA9ICh1bnNpZ25lZCBjaGFy
+ICopZG1hX3phbGxvY19jb2hlcmVudChhci0+ZGV2LA0KPj4gIAkJCQkJCSAgICAgICBhbGxvY19u
+Ynl0ZXMsDQo+PiAgCQkJCQkJICAgICAgICZjZV9kYXRhX2Jhc2UsDQo+PiAgCQkJCQkJICAgICAg
+IEdGUF9BVE9NSUMpOw0KPg0KPiB0cml2aWE6DQo+DQo+IE5pY2VyIHRvIHJlYWxpZ24gYXJndW1l
+bnRzIGFuZCByZW1vdmUgdGhlIHVubmVjZXNzYXJ5IGNhc3QuDQo+DQo+IFBlcmhhcHM6DQo+DQo+
+IAlkYXRhX2J1ZiA9IGRtYV96YWxsb2NfY29oZXJlbnQoYXItPmRldizCoGFsbG9jX25ieXRlcywg
+JmNlX2RhdGFfYmFzZSwNCj4gCQkJCSAgICAgIMKgR0ZQX0FUT01JQyk7DQoNClN1cmUsIGJ1dCB0
+aGF0IHNob3VsZCBiZSBpbiBhIHNlcGFyYXRlIHBhdGNoLg0KDQotLSANCkthbGxlIFZhbG8=
diff --git a/a/content_digest b/N1/content_digest
index b9f1ab8..c0411a6 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,46 +5,29 @@
  "Subject\0Re: [PATCH 2/3] ath10k: use dma_zalloc_coherent()\0"
  "Date\0Tue, 24 Jan 2017 05:18:49 +0000\0"
  "To\0Joe Perches <joe@perches.com>\0"
- "Cc\0linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>"
-  Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+ "Cc\0Srinivas Kandagatla <srinivas.kandagatla@linaro.org>"
   ath10k@lists.infradead.org <ath10k@lists.infradead.org>
- " netdev@vger.kernel.org <netdev@vger.kernel.org>\0"
+  linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>
+  netdev@vger.kernel.org <netdev@vger.kernel.org>
+ " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
- "Joe Perches <joe@perches.com> writes:\n"
- "\n"
- "> On Mon, 2017-01-23 at 15:04 +0000, Srinivas Kandagatla wrote:\n"
- ">> use dma_zalloc_coherent() instead of dma_alloc_coherent and memset().\n"
- "> []\n"
- ">> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c\n"
- "> []\n"
- ">> @@ -896,7 +896,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data,\n"
- ">>  \t */\n"
- ">>  \talloc_nbytes = min_t(unsigned int, nbytes, DIAG_TRANSFER_LIMIT);\n"
- ">>  \n"
- ">> -\tdata_buf = (unsigned char *)dma_alloc_coherent(ar->dev,\n"
- ">> +\tdata_buf = (unsigned char *)dma_zalloc_coherent(ar->dev,\n"
- ">>  \t\t\t\t\t\t       alloc_nbytes,\n"
- ">>  \t\t\t\t\t\t       &ce_data_base,\n"
- ">>  \t\t\t\t\t\t       GFP_ATOMIC);\n"
- ">\n"
- "> trivia:\n"
- ">\n"
- "> Nicer to realign arguments and remove the unnecessary cast.\n"
- ">\n"
- "> Perhaps:\n"
- ">\n"
- "> \tdata_buf = dma_zalloc_coherent(ar->dev,\302\240alloc_nbytes, &ce_data_base,\n"
- "> \t\t\t\t      \302\240GFP_ATOMIC);\n"
- "\n"
- "Sure, but that should be in a separate patch.\n"
- "\n"
- "-- \n"
- "Kalle Valo\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "Sm9lIFBlcmNoZXMgPGpvZUBwZXJjaGVzLmNvbT4gd3JpdGVzOg0KDQo+IE9uIE1vbiwgMjAxNy0w\n"
+ "MS0yMyBhdCAxNTowNCArMDAwMCwgU3Jpbml2YXMgS2FuZGFnYXRsYSB3cm90ZToNCj4+IHVzZSBk\n"
+ "bWFfemFsbG9jX2NvaGVyZW50KCkgaW5zdGVhZCBvZiBkbWFfYWxsb2NfY29oZXJlbnQgYW5kIG1l\n"
+ "bXNldCgpLg0KPiBbXQ0KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9h\n"
+ "dGgxMGsvcGNpLmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL3BjaS5jDQo+IFtd\n"
+ "DQo+PiBAQCAtODk2LDcgKzg5Niw3IEBAIHN0YXRpYyBpbnQgYXRoMTBrX3BjaV9kaWFnX3JlYWRf\n"
+ "bWVtKHN0cnVjdCBhdGgxMGsgKmFyLCB1MzIgYWRkcmVzcywgdm9pZCAqZGF0YSwNCj4+ICAJICov\n"
+ "DQo+PiAgCWFsbG9jX25ieXRlcyA9IG1pbl90KHVuc2lnbmVkIGludCwgbmJ5dGVzLCBESUFHX1RS\n"
+ "QU5TRkVSX0xJTUlUKTsNCj4+ICANCj4+IC0JZGF0YV9idWYgPSAodW5zaWduZWQgY2hhciAqKWRt\n"
+ "YV9hbGxvY19jb2hlcmVudChhci0+ZGV2LA0KPj4gKwlkYXRhX2J1ZiA9ICh1bnNpZ25lZCBjaGFy\n"
+ "ICopZG1hX3phbGxvY19jb2hlcmVudChhci0+ZGV2LA0KPj4gIAkJCQkJCSAgICAgICBhbGxvY19u\n"
+ "Ynl0ZXMsDQo+PiAgCQkJCQkJICAgICAgICZjZV9kYXRhX2Jhc2UsDQo+PiAgCQkJCQkJICAgICAg\n"
+ "IEdGUF9BVE9NSUMpOw0KPg0KPiB0cml2aWE6DQo+DQo+IE5pY2VyIHRvIHJlYWxpZ24gYXJndW1l\n"
+ "bnRzIGFuZCByZW1vdmUgdGhlIHVubmVjZXNzYXJ5IGNhc3QuDQo+DQo+IFBlcmhhcHM6DQo+DQo+\n"
+ "IAlkYXRhX2J1ZiA9IGRtYV96YWxsb2NfY29oZXJlbnQoYXItPmRldizCoGFsbG9jX25ieXRlcywg\n"
+ "JmNlX2RhdGFfYmFzZSwNCj4gCQkJCSAgICAgIMKgR0ZQX0FUT01JQyk7DQoNClN1cmUsIGJ1dCB0\n"
+ aGF0IHNob3VsZCBiZSBpbiBhIHNlcGFyYXRlIHBhdGNoLg0KDQotLSANCkthbGxlIFZhbG8=
 
-d866ab09c68d1fc2bf80d5363ef606d7d0812acc2b6513a7e42907531cb417b4
+4f3a63b5c184c432c4c6e9412ade0e8863bb05c6b0ef36231e4226943e280022
