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 s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
