From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herbert Xu Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree Date: Fri, 9 May 2014 20:51:51 +0800 Message-ID: <20140509125151.GA22796@gondor.apana.org.au> References: <20140509120702.62c609a3@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from ringil.hengli.com.au ([178.18.16.133]:38579 "EHLO ringil.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbaEIMv6 (ORCPT ); Fri, 9 May 2014 08:51:58 -0400 Content-Disposition: inline In-Reply-To: <20140509120702.62c609a3@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Eric W. Biederman" , David Miller , Matthias-Christian Ott 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 Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt