linux-kernel - linux-next: manual merge of the trivial 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-next>] [day] [month] [year] [list]

Date:	Mon, 11 Apr 2011 13:28:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Felix Fietkau <nbd@...nwrt.org>,
	"John W. Linville" <linville@...driver.com>,
	"Justin P. Mattock" <justinmattock@...il.com>
Subject: linux-next: manual merge of the trivial tree with the wireless tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
("ath9k_hw: turn a few big macros into functions") from the wireless tree
and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
trivial tree.

The former commit removed the code that the latter changed, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped