From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Herbert Xu <herbert@gondor•apana.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dan Williams <dan.j.williams@intel•com>
Subject: linux-next: manual merge of the block tree with the crypto tree
Date: Tue, 18 Aug 2015 13:14:23 +1000 [thread overview]
Message-ID: <20150818131423.7728ecc7@canb.auug.org.au> (raw)
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
reply other threads:[~2015-08-18 3:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150818131423.7728ecc7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=dan.j.williams@intel$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox