From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>,
Steffen Klassert <steffen.klassert@secunet•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the crypto tree with the ipsec tree
Date: Fri, 29 May 2015 14:21:40 +1000 [thread overview]
Message-ID: <20150529142140.1d052f26@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
net/ipv6/esp6.c between commit 6d7258ca9370 ("esp6: Use high-order
sequence number bits for IV generation") from the ipsec tree and commit
000ae7b2690e ("esp6: 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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-29 4:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 4:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-29 4:21 linux-next: manual merge of the crypto tree with the ipsec tree Stephen Rothwell
2015-05-29 4:26 ` 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=20150529142140.1d052f26@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=steffen.klassert@secunet$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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