Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree

From: "John W. Linville" <[email-masked]>
Date: Thu, 14 Jun 2012 08:59:53 -0400

On Thu, Jun 14, 2012 at 10:20:13AM +0530, Mohammed Shafi Shajakhan wrote:
> 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.

That sounds right.

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

I have it in wireless-next already...thanks!

John
-- 
John W. Linville		Someday the world will need a hero, and you
[email-masked]			might be all we have.  Be ready.