Subject: linux-next: manual merge of the block tree with the crypto tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 18 Aug 2015 13:14:23 +1000

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                    [email-masked]