linux-kernel - 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>] [day] [month] [year] [list]

Message-Id: <20100921122058.bb402193.sfr@canb.auug.org.au>
Date:	Tue, 21 Sep 2010 12:20:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bob Copeland <me@...copeland.com>,
	Bruno Randolf <br1@...fach.org>
Subject: linux-next: manual merge of the wireless tree with Linus' tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath5k/base.c between commit
d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a ("ath5k: check return value of
ieee80211_get_tx_rate") from Linus' tree and (probably) commit
bb18dec05909c96a13754f4e070e5d604cb2b805 ("ath5k: reorder base.c to
remove fwd decls") from the wireless tree.

I fixed it up (I think - I just applied the patch from Linus' tree to the
new position in the wireless tree file) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped