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

[John W. Linville]

On Tue, Sep 20, 2011 at 01:28:14PM +1000, Stephen Rothwell wrote:
> Hi John,
> 
> 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 221737d24f88 ("wl12xx: increase number of allowed SSIDs in
> sched_scan") from the wireless tree.
> 
> I fixed it up (I used the wireless tree version) and can carry the fix as
> necessary.
> 
> John, maybe you could merge the wireless-current tree (or the part of it
> that has already been merged into Linus' tree) into the wireless tree and
> fix these merge issues.

Yes, I will -- I'm trying to get resynced w/ Dave...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/