linux-kernel - Re: linux-next: manual merge of the wireless tree with the wireless-current 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20091124150525.GA2782@tuxdriver.com>
Date:	Tue, 24 Nov 2009 10:05:25 -0500
From:	"John W. Linville" <linville@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the wireless tree with the
	wireless-current tree

On Tue, Nov 24, 2009 at 02:11:41PM +1100, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath/ath9k/main.c between commit
> 54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as
> false") from the wireless-current tree and commit
> 18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as
> false") from the wireless tree.
> 
> The commit message of the latter made me use just its version.

Yes, that's the correct fix. :-)

-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/