* linux-next: manual merge of the crypto tree with the ipsec tree
@ 2015-05-29 4:21 Stephen Rothwell
2015-05-29 4:26 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-05-29 4:21 UTC (permalink / raw)
To: Herbert Xu, Steffen Klassert; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the ipsec tree
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
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2015-05-29 4:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Steffen Klassert, linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the crypto tree with the ipsec tree
@ 2015-05-29 4:21 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-05-29 4:21 UTC (permalink / raw)
To: Herbert Xu, Steffen Klassert; +Cc: linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-29 4:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2015-05-29 4:21 Stephen Rothwell
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).