linux-kernel - Re: linux-next: manual merge of the crypto tree with Linus' 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-prev] [day] [month] [year] [list]

Message-ID: <20140509125151.GA22796@gondor.apana.org.au>
Date:	Fri, 9 May 2014 20:51:51 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	David Miller <davem@...emloft.net>,
	Matthias-Christian Ott <ott@...ix.org>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree

On Fri, May 09, 2014 at 12:07:02PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
> netlink_ns_capable to verify the permisions of netlink messages") from
> Linus' tree and commit c568398aa05f ("crypto: user - Allow
> CRYPTO_MSG_GETALG without CAP_NET_ADMIN") from the crypto tree.
> 
> I fixed it up (I hope - see below) and can carry the fix as necessary
> (no action is required).

Looks good.  Thanks Stephen!
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/