* linux-next: manual merge of the block tree with the crypto tree
@ 2015-08-18 3:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-08-18 3:14 UTC (permalink / raw)
To: Jens Axboe, Herbert Xu; +Cc: linux-next, linux-kernel, Dan Williams
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@canb•auug.org.au
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-18 3:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-18 3:14 linux-next: manual merge of the block tree with the crypto tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox