Subject: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 9 Feb 2015 14:14:47 +1100

Hi Kalle,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/rtlwifi/pci.c between commit
e9538cf4f907 ("rtlwifi: Fix error when accessing unmapped memory in
skb") from Linus' tree and commit d0311314d002 ("rtlwifi: rtl8192ee:
Fix handling of new style descriptors") from the wireless-drivers-next
tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/wireless/rtlwifi/pci.c
index c70efb9a6e78,88331d729b0e..000000000000
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@@ -924,17 -917,14 +931,16 @@@ new_trx_end
  			rtlpriv->enter_ps = false;
  			schedule_work(&rtlpriv->works.lps_change_work);
  		}
- end:
 +		skb = new_skb;
 +no_new:
  		if (rtlpriv->use_new_trx_flow) {
 -			_rtl_pci_init_one_rxdesc(hw, (u8 *)buffer_desc,
 +			_rtl_pci_init_one_rxdesc(hw, skb, (u8 *)buffer_desc,
  						 rxring_idx,
 -					       rtlpci->rx_ring[rxring_idx].idx);
 +						 rtlpci->rx_ring[rxring_idx].idx);
  		} else {
 -			_rtl_pci_init_one_rxdesc(hw, (u8 *)pdesc, rxring_idx,
 +			_rtl_pci_init_one_rxdesc(hw, skb, (u8 *)pdesc,
 +						 rxring_idx,
  						 rtlpci->rx_ring[rxring_idx].idx);
 -
  			if (rtlpci->rx_ring[rxring_idx].idx ==
  			    rtlpci->rxringcount - 1)
  				rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,