linux-kernel - linux-next: manual merge of the staging tree with the trivial 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: <20110621151044.5d4330e2.sfr@canb.auug.org.au>
Date:	Tue, 21 Jun 2011 15:10:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vitaliy Ivanov <vitalivanov@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Roland Vossen <rvossen@...adcom.com>
Subject: linux-next: manual merge of the staging tree with the trivial tree

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c and
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and various commits from the staging tree.

I think the final versions in the staging tree supercedes the change in
the trivial tree, so I used the staging tree versions.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped