linux-kernel - linux-next: manual merge of the block tree with the crypto 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20150818131423.7728ecc7@canb.auug.org.au>
Date:	Tue, 18 Aug 2015 13:14:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>,
	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dan Williams <dan.j.williams@...el.com>
Subject: linux-next: manual merge of the block tree with the crypto tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in:

  crypto/ccm.c

between commit:

  81c4c35eb61a ("crypto: ccm - Convert to new AEAD interface")

from the crypto tree and commit:

  c56f6d1270b9 ("crypto: replace scatterwalk_sg_chain with sg_chain")

from the block tree.

I fixed it up (the former removed all the calls to scatterwalk_sg_chain)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/