Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209023 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-18 05:20 +0200 |
| Last post | 2015-08-18 05:20 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the block tree with the crypto tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-18 05:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-18 05:20 +0200 |
| Subject | linux-next: manual merge of the block tree with the crypto tree |
| Message-ID | <pYFBn-2aI-5@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web