Messages in this thread | | | Date | Fri, 29 May 2015 12:26:26 +0800 | From | Herbert Xu <> | Subject | Re: linux-next: manual merge of the crypto tree with the ipsec tree |
| |
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
| |