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 > 7021b2e

linux-next: manual merge of the crypto tree with the ipsec tree

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

linux-next: manual merge of the crypto tree with the ipsec tree

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