Re: pull-request: wireless-drivers-next 2015-02-07

[David Miller <davem@xxxxxxxxxxxxx>]

From: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Date: Sat, 07 Feb 2015 13:40:51 +0200

> There's a small conflict in drivers/net/wireless/rtlwifi/pci.c, the fix
> is to leave the two labels like this:
> 
> 			schedule_work(&rtlpriv->works.lps_change_work);
> 		}
> end:
> 		skb = new_skb;
> no_new:
> 		if (rtlpriv->use_new_trx_flow) {
> 
> 

That can't be the correct resolution:

drivers/net/wireless/rtlwifi/pci.c: In function ʽ_rtl_pci_rx_interruptʼ:
drivers/net/wireless/rtlwifi/pci.c:934:1: warning: label ʽendʼ defined but not used [-Wunused-label]

So I've removed that label in the merge commit.

> Please let me know if there are any issues and sorry for being late.

Pulled, thanks a lot.
?τθΊ{.nΗ+?·???­?+%?Λ?±ιέΆ??w?Ί{.nΗ+?·??{±?«zW¬³ψ§Ά?ʽά¨}©?²Ζ zΪ&j:+v?¨ώψ―ω?w?ώ?ΰ2?ή?¨θ­Ϊ&ʼ)ίʽ«aΆΪ??ϋΰzΏδzΉή?ϊ+?ω???έʼj??wθώf