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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 15 Nov 2012 09:06:40 +0100
From:	"Arend van Spriel" <arend@...adcom.com>
To:	"Stephen Rothwell" <sfr@...b.auug.org.au>
cc:	"John W. Linville" <linville@...driver.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Hauke Mehrtens" <hauke@...ke-m.de>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/