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
| ||
|
Date: Fri, 16 Mar 2012 12:58:02 +1100
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,
Joe Perches <joe@...ches.com>,
David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
Sujith Manoharan <c_manoha@....qualcomm.com>
Subject: linux-next: manual merge of the wireless-next tree with the
net-next tree
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/hw.c between commit 23677ce3172f
("drivers/net: Remove boolean comparisons to true/false") from the
net-next tree and commit caed6579c2f9 ("ath9k_hw: Cleanup
FastChannelChange") from the wireless-next tree.
The latter commit included the fix from the former, so I just used the
latter.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists