mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the crypto tree with the ipsec tree
Date: Fri, 29 May 2015 12:26:26 +0800	[thread overview]
Message-ID: <20150529042626.GA16932@gondor.apana.org.au> (raw)
In-Reply-To: <20150529142134.5206b395@canb.auug.org.au>

On Fri, May 29, 2015 at 02:21:34PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> net/ipv4/esp4.c between commit 64aa42338e9a ("esp4: Use high-order
> sequence number bits for IV generation") from the ipsec tree and commit
> 7021b2e1cddd ("esp4: Switch to new AEAD interface") from the crypto
> tree.
> 
> I fixed it up (the latter seems to have incorporated the change from
> the former) and can carry the fix as necessary (no action is required).

Thanks Stephen, yes just carrying the latter should be good enough.
-- 
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

  reply	other threads:[~2015-05-29  4:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  4:21 Stephen Rothwell
2015-05-29  4:26 ` Herbert Xu [this message]
2015-05-29  4:21 Stephen Rothwell

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=20150529042626.GA16932@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@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
all inboxes | Powered by JetHome®