Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1338666

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

Show all headers | View raw

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:
> 
>   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).

Thank you Stephen!
-- 
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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the crypto tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-19 01:00 +0100
  Re: linux-next: manual merge of the crypto tree with the net tree Herbert Xu <herbert@gondor.apana.org.au> - 2016-02-20 09:50 +0100

csiph-web