* linux-next: manual merge of the crypto tree with the net tree
@ 2016-02-18 23:49 Stephen Rothwell
2016-02-20 8:44 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-02-18 23:49 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-next, linux-kernel, Insu Yun
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the crypto tree with the net tree
2016-02-18 23:49 linux-next: manual merge of the crypto tree with the net tree Stephen Rothwell
@ 2016-02-20 8:44 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2016-02-20 8:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Insu Yun
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-20 8:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-18 23:49 linux-next: manual merge of the crypto tree with the net tree Stephen Rothwell
2016-02-20 8:44 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).