Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

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@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/