diff for duplicates of <87oa3xp5ea.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index 07259c0..302eb23 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,19 +4,21 @@ Mohammed Shafi Shajakhan <mohammed@codeaurora.org> writes:
 >
 > On Thu, Aug 18, 2016 at 06:26:35PM -0700, greearb@candelatech.com wrote:
 >> From: Ben Greear <greearb@candelatech.com>
->> 
+>>=20
 >> Helps to know the sta pointer.
->> 
+>>=20
 >> Signed-off-by: Ben Greear <greearb@candelatech.com>
 >> ---
 >>  drivers/net/wireless/ath/ath10k/mac.c | 4 ++--
 >>  1 file changed, 2 insertions(+), 2 deletions(-)
->> 
->> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
+>>=20
+>> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireles=
+s/ath/ath10k/mac.c
 >> index d96c06e..82bc0da 100644
 >> --- a/drivers/net/wireless/ath/ath10k/mac.c
 >> +++ b/drivers/net/wireless/ath/ath10k/mac.c
->> @@ -6491,8 +6491,8 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
+>> @@ -6491,8 +6491,8 @@ static int ath10k_sta_state(struct ieee80211_hw *h=
+w,
 >>  		 * Existing station deletion.
 >>  		 */
 >>  		ath10k_dbg(ar, ATH10K_DBG_MAC,
@@ -25,14 +27,10 @@ Mohammed Shafi Shajakhan <mohammed@codeaurora.org> writes:
 >> +			   "mac vdev %d peer delete %pM (sta gone) sta: %p\n",
 >> +			   arvif->vdev_id, sta->addr, sta);
 >
-> good to rebase over Maharaja's change (%p to %pK) 
+> good to rebase over Maharaja's change (%p to %pK)=20
 > https://patchwork.kernel.org/patch/9263691/
 
 I added that to the patch in the pending branch.
 
--- 
-Kalle Valo
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+--=20
+Kalle Valo=
diff --git a/a/content_digest b/N1/content_digest
index 6ca17a0..cdcf851 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -16,19 +16,21 @@
  ">\n"
  "> On Thu, Aug 18, 2016 at 06:26:35PM -0700, greearb@candelatech.com wrote:\n"
  ">> From: Ben Greear <greearb@candelatech.com>\n"
- ">> \n"
+ ">>=20\n"
  ">> Helps to know the sta pointer.\n"
- ">> \n"
+ ">>=20\n"
  ">> Signed-off-by: Ben Greear <greearb@candelatech.com>\n"
  ">> ---\n"
  ">>  drivers/net/wireless/ath/ath10k/mac.c | 4 ++--\n"
  ">>  1 file changed, 2 insertions(+), 2 deletions(-)\n"
- ">> \n"
- ">> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c\n"
+ ">>=20\n"
+ ">> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireles=\n"
+ "s/ath/ath10k/mac.c\n"
  ">> index d96c06e..82bc0da 100644\n"
  ">> --- a/drivers/net/wireless/ath/ath10k/mac.c\n"
  ">> +++ b/drivers/net/wireless/ath/ath10k/mac.c\n"
- ">> @@ -6491,8 +6491,8 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,\n"
+ ">> @@ -6491,8 +6491,8 @@ static int ath10k_sta_state(struct ieee80211_hw *h=\n"
+ "w,\n"
  ">>  \t\t * Existing station deletion.\n"
  ">>  \t\t */\n"
  ">>  \t\tath10k_dbg(ar, ATH10K_DBG_MAC,\n"
@@ -37,16 +39,12 @@
  ">> +\t\t\t   \"mac vdev %d peer delete %pM (sta gone) sta: %p\\n\",\n"
  ">> +\t\t\t   arvif->vdev_id, sta->addr, sta);\n"
  ">\n"
- "> good to rebase over Maharaja's change (%p to %pK) \n"
+ "> good to rebase over Maharaja's change (%p to %pK)=20\n"
  "> https://patchwork.kernel.org/patch/9263691/\n"
  "\n"
  "I added that to the patch in the pending branch.\n"
  "\n"
- "-- \n"
- "Kalle Valo\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "--=20\n"
+ Kalle Valo=
 
-00822eae3d372e6d571c52d375cbc27b418ca591c61b5a06ee67981d5a3e5afa
+bb2924d3626cd18166bce522740c4c617dead6527b7154867f36c49a217b8263
