From: Herbert Xu <herbert@gondor.apana.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Eric W. Biederman" <ebiederm@xmission.com>,
David Miller <davem@davemloft.net>,
Matthias-Christian Ott <ott@mirix.org>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree
Date: Fri, 9 May 2014 20:51:51 +0800 [thread overview]
Message-ID: <20140509125151.GA22796@gondor.apana.org.au> (raw)
In-Reply-To: <20140509120702.62c609a3@canb.auug.org.au>
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@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2014-05-09 12:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 2:07 linux-next: manual merge of the crypto tree with Linus' tree Stephen Rothwell
2014-05-09 12:51 ` Herbert Xu [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 1:52 Stephen Rothwell
2021-06-15 1:39 Stephen Rothwell
2020-09-21 2:36 Stephen Rothwell
2020-05-11 3:23 Stephen Rothwell
2019-11-05 2:23 Stephen Rothwell
2019-08-23 3:08 Stephen Rothwell
2019-08-23 3:25 ` Nick Desaulniers
2019-06-11 2:07 Stephen Rothwell
2019-06-03 0:52 Stephen Rothwell
2014-04-17 2:57 Stephen Rothwell
2014-04-17 2:49 Stephen Rothwell
2012-05-07 2:31 Stephen Rothwell
2012-05-07 4:20 ` Herbert Xu
2012-05-07 2:11 Stephen Rothwell
2012-05-07 4:16 ` Herbert Xu
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 9:04 ` Herbert Xu
2012-05-07 11:02 ` Linus Walleij
2010-04-14 1:48 Stephen Rothwell
2010-04-14 3:14 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140509125151.GA22796@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ott@mirix.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).