linux-kernel - linux-next: manual merge of the staging tree with the net-next 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: <20140317190842.795b9d29db9a131a9cff91a9@canb.auug.org.au>
Date:	Mon, 17 Mar 2014 19:08:42 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, David Miller <davem@...emloft.net>,
	<netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"John W. Linville" <linville@...driver.com>,
	"Zhao, Gang" <gamerh2o@...il.com>
Subject: linux-next: manual merge of the staging tree with the net-next tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/wlan-ng/cfg80211.c between commit 3ead0d2e220e ("wlan-ng:
fixup staging driver for removal of ieee80211_dsss_chan_to_freq") from
the net-next tree and commit 4e5e9d7c66f0 ("staging: wlan-ng: replace
function ieee80211_dsss_chan_to_freq()") from the staging tree.

I fixed it up (I used the staging tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped