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

From: David Miller <[email-masked]>
Date: Thu, 06 Nov 2008 20:47:58 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Nov 2008 15:24:24 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/ath5k/base.c between commit
> 934f6c3f8e7f5d6a6d07ae2df283fd02393019dd ("Revert "ath5k: honor
> FIF_BCN_PRBRESP_PROMISC in STA mode"") from the net-current tree and
> commit b706e65b40417e03c2451bb3f92488f3736843fa ("ath5k: fix mesh point
> operation") from the net tree.
> 
> Just a context change.  I fixed it up (see below) and assume it will be
> fixed in your tree soon.

Thanks a lot Stephen, I'll do a merge to fix this up!