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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150529042626.GA16932@gondor.apana.org.au>
Date:	Fri, 29 May 2015 12:26:26 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Steffen Klassert <steffen.klassert@...unet.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: 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 <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/