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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

Attachment: pgpcdZIbaSFiV.pgp
Description: OpenPGP digital signature