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

2016-02-20 Thread Herbert Xu
On Fri, Feb 19, 2016 at 10:49:57AM +1100, Stephen Rothwell wrote: > 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: >

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

2016-02-18 Thread 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 remove