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

From: "Arend van Spriel" <[email-masked]>
Date: Thu, 15 Nov 2012 09:06:40 +0100

On 11/15/2012 03:17 AM, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit
> d61f978b8f26 ("brcmfmac: fix typo in CONFIG_BRCMISCAN") from the  tree
> and commit f07998959d57 ("brcmfmac: remove obsolete i-scan and clean up
> related code") from the wireless-next tree.
>
> I used the latter (which removed the line that was fixed in the former)
> and can carry the fix as necessary (no action is required).
>

Agreed. The typo fix is only needed for v3.7.

Gr. AvS