From: Herbert Xu <herbert@gondor.hengli.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jussi Kivilinna <jussi.kivilinna@mbnet.fi>,
Steffen Klassert <steffen.klassert@secunet.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Julia Lawall <Julia.Lawall@lip6.fr>
Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree
Date: Wed, 6 Feb 2013 13:45:57 +0800 [thread overview]
Message-ID: <20130206054557.GA3815@gondor.apana.org.au> (raw)
In-Reply-To: <20130206132011.9084f982f783cd9d298f187d@canb.auug.org.au>
On Wed, Feb 06, 2013 at 01:20:11PM +1100, Stephen Rothwell wrote:
> Hi Herbert,
>
> Today's linux-next merge of the crypto tree got a conflict in
> crypto/ctr.c between commit 69d3150cfc20 ("crypto: ctr - make rfc3686
> asynchronous block cipher") from the net-next tree and commit
> 3e8afe35c36f ("crypto: use ERR_CAST") from the crypto tree.
>
> I fixed it up (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:[~2013-02-06 5:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 2:20 linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell
2013-02-06 5:45 ` Herbert Xu [this message]
2016-03-07 2:18 Stephen Rothwell
2016-03-07 11:08 ` David Howells
2016-03-08 5:56 ` Stephen Rothwell
2016-03-08 16:48 ` David Howells
2016-03-08 21:22 ` Stephen Rothwell
2018-01-25 10:52 Stephen Rothwell
2018-07-30 3:22 Stephen Rothwell
2018-07-31 6:24 ` Krzysztof Kozlowski
2018-08-15 3:12 ` Stephen Rothwell
2020-03-30 0:42 Stephen Rothwell
2020-03-30 0:49 ` Herbert Xu
2020-03-30 15:35 ` Ayush Sawal
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=20130206054557.GA3815@gondor.apana.org.au \
--to=herbert@gondor.hengli.com.au \
--cc=Julia.Lawall@lip6.fr \
--cc=davem@davemloft.net \
--cc=jussi.kivilinna@mbnet.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steffen.klassert@secunet.com \
/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).