diff for duplicates of <5798B042.4070604@qti.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index b057f93..7b5a598 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,47 +1,37 @@
-On Wednesday 27 July 2016 06:13 PM, Michal Kazior wrote:
-> On 27 July 2016 at 14:36, Vasanthakumar Thiagarajan
-> <vthiagar@qti.qualcomm.com> wrote:
->> There are slight differences in Rx hw descriptor information
->> among different chips. So far driver does not use those new
->> information for any functionalities, but there is one important
->> information which is available from QCA99X0 onwards to indicate
->> the number of bytes that hw padded at the begining of the rx
->> payload and this information is needed to undecap the rx
->> packet. Add an abstraction for Rx desc to make use of the
->> new desc information available. The callback that this patch
->> defines to retrieve the padding bytes will be used in follow-up
->> patch.
->>
->> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
->> ---
->>   drivers/net/wireless/ath/ath10k/core.c | 12 ++++++++++++
->>   drivers/net/wireless/ath/ath10k/hw.c   | 13 +++++++++++++
->>   drivers/net/wireless/ath/ath10k/hw.h   | 12 ++++++++++++
->>   3 files changed, 37 insertions(+)
->>
->> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
->> index e889829..9c5e93b 100644
->> --- a/drivers/net/wireless/ath/ath10k/core.c
->> +++ b/drivers/net/wireless/ath/ath10k/core.c
->> @@ -68,6 +68,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
->>                          .board_size = QCA988X_BOARD_DATA_SZ,
->>                          .board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,
->>                  },
->> +               .hw_rx_desc_ops = &qca988x_rx_desc_ops,
-> [...]
->> +struct ath10k_hw_rx_desc_ops {
->> +       int (*rx_desc_get_l3_pad_bytes)(struct htt_rx_desc *rxd);
->> +};
->
-> Benjamin is trying to implement coverage class by poking hw registers
-> over firmware's head [1]. I'm thinking the hw_rx_desc_ops could be
-> generalized to hw_ops so it can be used for doing hw-specific hacks as
-> well. What do you think?
-
-Sure. Instead of reworking this patch set, can this be done in a separate patch?.
-
-Vasanth
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+T24gV2VkbmVzZGF5IDI3IEp1bHkgMjAxNiAwNjoxMyBQTSwgTWljaGFsIEthemlvciB3cm90ZToN
+Cj4gT24gMjcgSnVseSAyMDE2IGF0IDE0OjM2LCBWYXNhbnRoYWt1bWFyIFRoaWFnYXJhamFuDQo+
+IDx2dGhpYWdhckBxdGkucXVhbGNvbW0uY29tPiB3cm90ZToNCj4+IFRoZXJlIGFyZSBzbGlnaHQg
+ZGlmZmVyZW5jZXMgaW4gUnggaHcgZGVzY3JpcHRvciBpbmZvcm1hdGlvbg0KPj4gYW1vbmcgZGlm
+ZmVyZW50IGNoaXBzLiBTbyBmYXIgZHJpdmVyIGRvZXMgbm90IHVzZSB0aG9zZSBuZXcNCj4+IGlu
+Zm9ybWF0aW9uIGZvciBhbnkgZnVuY3Rpb25hbGl0aWVzLCBidXQgdGhlcmUgaXMgb25lIGltcG9y
+dGFudA0KPj4gaW5mb3JtYXRpb24gd2hpY2ggaXMgYXZhaWxhYmxlIGZyb20gUUNBOTlYMCBvbndh
+cmRzIHRvIGluZGljYXRlDQo+PiB0aGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaHcgcGFkZGVkIGF0
+IHRoZSBiZWdpbmluZyBvZiB0aGUgcngNCj4+IHBheWxvYWQgYW5kIHRoaXMgaW5mb3JtYXRpb24g
+aXMgbmVlZGVkIHRvIHVuZGVjYXAgdGhlIHJ4DQo+PiBwYWNrZXQuIEFkZCBhbiBhYnN0cmFjdGlv
+biBmb3IgUnggZGVzYyB0byBtYWtlIHVzZSBvZiB0aGUNCj4+IG5ldyBkZXNjIGluZm9ybWF0aW9u
+IGF2YWlsYWJsZS4gVGhlIGNhbGxiYWNrIHRoYXQgdGhpcyBwYXRjaA0KPj4gZGVmaW5lcyB0byBy
+ZXRyaWV2ZSB0aGUgcGFkZGluZyBieXRlcyB3aWxsIGJlIHVzZWQgaW4gZm9sbG93LXVwDQo+PiBw
+YXRjaC4NCj4+DQo+PiBTaWduZWQtb2ZmLWJ5OiBWYXNhbnRoYWt1bWFyIFRoaWFnYXJhamFuIDx2
+dGhpYWdhckBxdGkucXVhbGNvbW0uY29tPg0KPj4gLS0tDQo+PiAgIGRyaXZlcnMvbmV0L3dpcmVs
+ZXNzL2F0aC9hdGgxMGsvY29yZS5jIHwgMTIgKysrKysrKysrKysrDQo+PiAgIGRyaXZlcnMvbmV0
+L3dpcmVsZXNzL2F0aC9hdGgxMGsvaHcuYyAgIHwgMTMgKysrKysrKysrKysrKw0KPj4gICBkcml2
+ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL2h3LmggICB8IDEyICsrKysrKysrKysrKw0KPj4g
+ICAzIGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKykNCj4+DQo+PiBkaWZmIC0tZ2l0IGEv
+ZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEway9jb3JlLmMgYi9kcml2ZXJzL25ldC93aXJl
+bGVzcy9hdGgvYXRoMTBrL2NvcmUuYw0KPj4gaW5kZXggZTg4OTgyOS4uOWM1ZTkzYiAxMDA2NDQN
+Cj4+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsvY29yZS5jDQo+PiArKysg
+Yi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL2NvcmUuYw0KPj4gQEAgLTY4LDYgKzY4
+LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhdGgxMGtfaHdfcGFyYW1zIGF0aDEwa19od19wYXJh
+bXNfbGlzdFtdID0gew0KPj4gICAgICAgICAgICAgICAgICAgICAgICAgIC5ib2FyZF9zaXplID0g
+UUNBOTg4WF9CT0FSRF9EQVRBX1NaLA0KPj4gICAgICAgICAgICAgICAgICAgICAgICAgIC5ib2Fy
+ZF9leHRfc2l6ZSA9IFFDQTk4OFhfQk9BUkRfRVhUX0RBVEFfU1osDQo+PiAgICAgICAgICAgICAg
+ICAgIH0sDQo+PiArICAgICAgICAgICAgICAgLmh3X3J4X2Rlc2Nfb3BzID0gJnFjYTk4OHhfcnhf
+ZGVzY19vcHMsDQo+IFsuLi5dDQo+PiArc3RydWN0IGF0aDEwa19od19yeF9kZXNjX29wcyB7DQo+
+PiArICAgICAgIGludCAoKnJ4X2Rlc2NfZ2V0X2wzX3BhZF9ieXRlcykoc3RydWN0IGh0dF9yeF9k
+ZXNjICpyeGQpOw0KPj4gK307DQo+DQo+IEJlbmphbWluIGlzIHRyeWluZyB0byBpbXBsZW1lbnQg
+Y292ZXJhZ2UgY2xhc3MgYnkgcG9raW5nIGh3IHJlZ2lzdGVycw0KPiBvdmVyIGZpcm13YXJlJ3Mg
+aGVhZCBbMV0uIEknbSB0aGlua2luZyB0aGUgaHdfcnhfZGVzY19vcHMgY291bGQgYmUNCj4gZ2Vu
+ZXJhbGl6ZWQgdG8gaHdfb3BzIHNvIGl0IGNhbiBiZSB1c2VkIGZvciBkb2luZyBody1zcGVjaWZp
+YyBoYWNrcyBhcw0KPiB3ZWxsLiBXaGF0IGRvIHlvdSB0aGluaz8NCg0KU3VyZS4gSW5zdGVhZCBv
+ZiByZXdvcmtpbmcgdGhpcyBwYXRjaCBzZXQsIGNhbiB0aGlzIGJlIGRvbmUgaW4gYSBzZXBhcmF0
+ZSBwYXRjaD8uDQoNClZhc2FudGgNCg==
diff --git a/a/content_digest b/N1/content_digest
index b2d3d15..ae96bae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,56 +5,46 @@
  "Subject\0Re: [PATCH 2/4] ath10k: Add provision for Rx descriptor abstraction\0"
  "Date\0Wed, 27 Jul 2016 12:59:47 +0000\0"
  "To\0michal.kazior@tieto.com <michal.kazior@tieto.com>\0"
- "Cc\0linux-wireless <linux-wireless@vger.kernel.org>"
- " ath10k@lists.infradead.org <ath10k@lists.infradead.org>\0"
+ "Cc\0ath10k@lists.infradead.org <ath10k@lists.infradead.org>"
+ " linux-wireless <linux-wireless@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
- "On Wednesday 27 July 2016 06:13 PM, Michal Kazior wrote:\n"
- "> On 27 July 2016 at 14:36, Vasanthakumar Thiagarajan\n"
- "> <vthiagar@qti.qualcomm.com> wrote:\n"
- ">> There are slight differences in Rx hw descriptor information\n"
- ">> among different chips. So far driver does not use those new\n"
- ">> information for any functionalities, but there is one important\n"
- ">> information which is available from QCA99X0 onwards to indicate\n"
- ">> the number of bytes that hw padded at the begining of the rx\n"
- ">> payload and this information is needed to undecap the rx\n"
- ">> packet. Add an abstraction for Rx desc to make use of the\n"
- ">> new desc information available. The callback that this patch\n"
- ">> defines to retrieve the padding bytes will be used in follow-up\n"
- ">> patch.\n"
- ">>\n"
- ">> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>\n"
- ">> ---\n"
- ">>   drivers/net/wireless/ath/ath10k/core.c | 12 ++++++++++++\n"
- ">>   drivers/net/wireless/ath/ath10k/hw.c   | 13 +++++++++++++\n"
- ">>   drivers/net/wireless/ath/ath10k/hw.h   | 12 ++++++++++++\n"
- ">>   3 files changed, 37 insertions(+)\n"
- ">>\n"
- ">> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c\n"
- ">> index e889829..9c5e93b 100644\n"
- ">> --- a/drivers/net/wireless/ath/ath10k/core.c\n"
- ">> +++ b/drivers/net/wireless/ath/ath10k/core.c\n"
- ">> @@ -68,6 +68,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {\n"
- ">>                          .board_size = QCA988X_BOARD_DATA_SZ,\n"
- ">>                          .board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,\n"
- ">>                  },\n"
- ">> +               .hw_rx_desc_ops = &qca988x_rx_desc_ops,\n"
- "> [...]\n"
- ">> +struct ath10k_hw_rx_desc_ops {\n"
- ">> +       int (*rx_desc_get_l3_pad_bytes)(struct htt_rx_desc *rxd);\n"
- ">> +};\n"
- ">\n"
- "> Benjamin is trying to implement coverage class by poking hw registers\n"
- "> over firmware's head [1]. I'm thinking the hw_rx_desc_ops could be\n"
- "> generalized to hw_ops so it can be used for doing hw-specific hacks as\n"
- "> well. What do you think?\n"
- "\n"
- "Sure. Instead of reworking this patch set, can this be done in a separate patch?.\n"
- "\n"
- "Vasanth\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "T24gV2VkbmVzZGF5IDI3IEp1bHkgMjAxNiAwNjoxMyBQTSwgTWljaGFsIEthemlvciB3cm90ZToN\n"
+ "Cj4gT24gMjcgSnVseSAyMDE2IGF0IDE0OjM2LCBWYXNhbnRoYWt1bWFyIFRoaWFnYXJhamFuDQo+\n"
+ "IDx2dGhpYWdhckBxdGkucXVhbGNvbW0uY29tPiB3cm90ZToNCj4+IFRoZXJlIGFyZSBzbGlnaHQg\n"
+ "ZGlmZmVyZW5jZXMgaW4gUnggaHcgZGVzY3JpcHRvciBpbmZvcm1hdGlvbg0KPj4gYW1vbmcgZGlm\n"
+ "ZmVyZW50IGNoaXBzLiBTbyBmYXIgZHJpdmVyIGRvZXMgbm90IHVzZSB0aG9zZSBuZXcNCj4+IGlu\n"
+ "Zm9ybWF0aW9uIGZvciBhbnkgZnVuY3Rpb25hbGl0aWVzLCBidXQgdGhlcmUgaXMgb25lIGltcG9y\n"
+ "dGFudA0KPj4gaW5mb3JtYXRpb24gd2hpY2ggaXMgYXZhaWxhYmxlIGZyb20gUUNBOTlYMCBvbndh\n"
+ "cmRzIHRvIGluZGljYXRlDQo+PiB0aGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaHcgcGFkZGVkIGF0\n"
+ "IHRoZSBiZWdpbmluZyBvZiB0aGUgcngNCj4+IHBheWxvYWQgYW5kIHRoaXMgaW5mb3JtYXRpb24g\n"
+ "aXMgbmVlZGVkIHRvIHVuZGVjYXAgdGhlIHJ4DQo+PiBwYWNrZXQuIEFkZCBhbiBhYnN0cmFjdGlv\n"
+ "biBmb3IgUnggZGVzYyB0byBtYWtlIHVzZSBvZiB0aGUNCj4+IG5ldyBkZXNjIGluZm9ybWF0aW9u\n"
+ "IGF2YWlsYWJsZS4gVGhlIGNhbGxiYWNrIHRoYXQgdGhpcyBwYXRjaA0KPj4gZGVmaW5lcyB0byBy\n"
+ "ZXRyaWV2ZSB0aGUgcGFkZGluZyBieXRlcyB3aWxsIGJlIHVzZWQgaW4gZm9sbG93LXVwDQo+PiBw\n"
+ "YXRjaC4NCj4+DQo+PiBTaWduZWQtb2ZmLWJ5OiBWYXNhbnRoYWt1bWFyIFRoaWFnYXJhamFuIDx2\n"
+ "dGhpYWdhckBxdGkucXVhbGNvbW0uY29tPg0KPj4gLS0tDQo+PiAgIGRyaXZlcnMvbmV0L3dpcmVs\n"
+ "ZXNzL2F0aC9hdGgxMGsvY29yZS5jIHwgMTIgKysrKysrKysrKysrDQo+PiAgIGRyaXZlcnMvbmV0\n"
+ "L3dpcmVsZXNzL2F0aC9hdGgxMGsvaHcuYyAgIHwgMTMgKysrKysrKysrKysrKw0KPj4gICBkcml2\n"
+ "ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL2h3LmggICB8IDEyICsrKysrKysrKysrKw0KPj4g\n"
+ "ICAzIGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKykNCj4+DQo+PiBkaWZmIC0tZ2l0IGEv\n"
+ "ZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDEway9jb3JlLmMgYi9kcml2ZXJzL25ldC93aXJl\n"
+ "bGVzcy9hdGgvYXRoMTBrL2NvcmUuYw0KPj4gaW5kZXggZTg4OTgyOS4uOWM1ZTkzYiAxMDA2NDQN\n"
+ "Cj4+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGgxMGsvY29yZS5jDQo+PiArKysg\n"
+ "Yi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoMTBrL2NvcmUuYw0KPj4gQEAgLTY4LDYgKzY4\n"
+ "LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhdGgxMGtfaHdfcGFyYW1zIGF0aDEwa19od19wYXJh\n"
+ "bXNfbGlzdFtdID0gew0KPj4gICAgICAgICAgICAgICAgICAgICAgICAgIC5ib2FyZF9zaXplID0g\n"
+ "UUNBOTg4WF9CT0FSRF9EQVRBX1NaLA0KPj4gICAgICAgICAgICAgICAgICAgICAgICAgIC5ib2Fy\n"
+ "ZF9leHRfc2l6ZSA9IFFDQTk4OFhfQk9BUkRfRVhUX0RBVEFfU1osDQo+PiAgICAgICAgICAgICAg\n"
+ "ICAgIH0sDQo+PiArICAgICAgICAgICAgICAgLmh3X3J4X2Rlc2Nfb3BzID0gJnFjYTk4OHhfcnhf\n"
+ "ZGVzY19vcHMsDQo+IFsuLi5dDQo+PiArc3RydWN0IGF0aDEwa19od19yeF9kZXNjX29wcyB7DQo+\n"
+ "PiArICAgICAgIGludCAoKnJ4X2Rlc2NfZ2V0X2wzX3BhZF9ieXRlcykoc3RydWN0IGh0dF9yeF9k\n"
+ "ZXNjICpyeGQpOw0KPj4gK307DQo+DQo+IEJlbmphbWluIGlzIHRyeWluZyB0byBpbXBsZW1lbnQg\n"
+ "Y292ZXJhZ2UgY2xhc3MgYnkgcG9raW5nIGh3IHJlZ2lzdGVycw0KPiBvdmVyIGZpcm13YXJlJ3Mg\n"
+ "aGVhZCBbMV0uIEknbSB0aGlua2luZyB0aGUgaHdfcnhfZGVzY19vcHMgY291bGQgYmUNCj4gZ2Vu\n"
+ "ZXJhbGl6ZWQgdG8gaHdfb3BzIHNvIGl0IGNhbiBiZSB1c2VkIGZvciBkb2luZyBody1zcGVjaWZp\n"
+ "YyBoYWNrcyBhcw0KPiB3ZWxsLiBXaGF0IGRvIHlvdSB0aGluaz8NCg0KU3VyZS4gSW5zdGVhZCBv\n"
+ "ZiByZXdvcmtpbmcgdGhpcyBwYXRjaCBzZXQsIGNhbiB0aGlzIGJlIGRvbmUgaW4gYSBzZXBhcmF0\n"
+ ZSBwYXRjaD8uDQoNClZhc2FudGgNCg==
 
-a207c4b265681153540f604ee609120a3304c48df2648e5b5b16c67168d5ee4d
+5999b454ee77c9b73e5af3df29a0f886038f901b0c194191771acc2acec207cd
