[lkml]   [2015]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the crypto tree with the ipsec tree
On Fri, May 29, 2015 at 02:21:34PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> Today's linux-next merge of the crypto tree got a conflict in
> net/ipv4/esp4.c between commit 64aa42338e9a ("esp4: Use high-order
> sequence number bits for IV generation") from the ipsec tree and commit
> 7021b2e1cddd ("esp4: Switch to new AEAD interface") from the crypto
> tree.
> I fixed it up (the latter seems to have incorporated the change from
> the former) and can carry the fix as necessary (no action is required).

Thanks Stephen, yes just carrying the latter should be good enough.
Email: Herbert Xu <>
Home Page:
PGP Key:

 \ /
  Last update: 2015-05-29 07:01    [W:0.030 / U:25.676 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site