linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20150529142134.5206b395@canb.auug.org.au>
Date:	Fri, 29 May 2015 14:21:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>,
	Steffen Klassert <steffen.klassert@...unet.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the crypto tree with the ipsec tree

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped