Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/dvm/tx.c between commit f590dcec9445
("iwlwifi: fix the reclaimed packet tracking upon flush queue") from
Linus' tree and commit 1c3fea82d6eb ("iwlwifi: improve the reports in TX
path") from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
index 31534f7,b0aad71..0000000

--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c

@@@ -1218,14 -1205,8 +1210,15 @@@ int iwlagn_rx_reply_tx(struct iwl_priv 
  			freed++;
  		}
  
 +		if (tid != IWL_TID_NON_QOS) {
 +			priv->tid_data[sta_id][tid].next_reclaimed =
 +				next_reclaimed;
 +			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
 +					   next_reclaimed);
 +		}
 +
- 		WARN_ON(!is_agg && freed != 1);
+ 		if (!is_agg && freed != 1)
+ 			IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
  
  		/*
  		 * An offchannel frame can be send only on the AUX queue, where