lkml.org 
[lkml]   [2016]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the crypto tree with the net tree
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

\
 
 \ /
  Last update: 2016-02-19 01:21    [W:0.027 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site