lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the net-next tree with the wireless tree
Hi Stephen,

On Thursday 14 June 2012 08:42 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/ath/ath9k/main.c between commit bcb7ad7bcbef
> ("ath9k: Fix softlockup in AR9485") from the wireless tree and commit
> ef1b6cd9a1ba ("ath9k: Group link monitoring logic") from the net-next
> tree.
>
> The latter removes the code modified by the former, so I did that. The
> fix from the former patch may be needed elsewhere now.

the back ported version of this patch is recently sent
http://www.spinics.net/lists/linux-wireless/msg92125.html


--
thanks,
shafi


\
 
 \ /
  Last update: 2012-06-14 07:22    [W:0.038 / U:0.900 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site