netdev - 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140528182824.63672ad9@canb.auug.org.au>
Date:	Wed, 28 May 2014 18:28:24 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, David Miller <davem@...emloft.net>,
	<netdev@...r.kernel.org>,
	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	Johannes Berg <johannes.berg@...el.com>,
	Sachin Kamat <sachin.kamat@...aro.org>
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/rtl8821ae/core.c between commit 77be2c54c5bd
("mac80211: add vif to flush call") from the net-next tree and commit
0cd05ba54a53 ("staging: rtl8821ae: core.c: Remove version specific
code") from the staging tree.

I fixed it up (the former is a suberset of the latter for this
particular conflict) and can carry the fix as necessary (no action is
required).

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

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)