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

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  net/ipv4/tcp.c

between commit:

  1eea84b74cd2 ("tcp: correctly crypto_alloc_hash return check")

from the net tree and commit:

  cf80e0e47e0e ("tcp: Use ahash")

from the crypto tree.

I fixed it up (the latter removed the code fixed by the former) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell