linux-kernel - Re: linux-next: manual merge of the wireless tree with Linus' 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]

Message-ID: <1316410122.2157.22.camel@cumari>
Date:	Mon, 19 Sep 2011 08:28:42 +0300
From:	Luciano Coelho <coelho@...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
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree

Hi Stephen

On Mon, 2011-09-19 at 15:14 +1000, Stephen Rothwell wrote: 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
> add max_sched_scan_ssids value to the hw description") from Linus' tree
> and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
> sched_scan") from the wireless tree.
> 
> I used the version from the wireless tree.

This is correct, the version from the wireless tree should be use (ie.,
setting the value to 8).  I guess wireless-next doesn't include the
change that went into Linus' tree yet.

-- 
Cheers,
Luca.

--
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/