From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alasdair G Kergon <agk@redhat•com>,
Mike Snitzer <snitzer@kernel•org>,
Herbert Xu <herbert@gondor•apana.org.au>
Cc: Linux Crypto List <linux-crypto@vger•kernel.org>,
Heinz Mauelshagen <heinzm@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the device-mapper tree with the crypto tree
Date: Tue, 14 Feb 2023 11:05:21 +1100 [thread overview]
Message-ID: <20230214110521.77685fbb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
Hi all,
Today's linux-next merge of the device-mapper tree got a conflict in:
drivers/md/dm-integrity.c
between commits:
96747228b725 ("dm: Add scaffolding to change completion function signature")
dcfe653d7cd4 ("dm: Remove completion function scaffolding")
from the crypto tree and commit:
ff65cea88e49 ("dm: add missing empty lines")
from the device-mapper tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/md/dm-integrity.c
index c58156deb2b1,16aa68988363..000000000000
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@@ -955,9 -963,10 +963,10 @@@ static void xor_journal(struct dm_integ
async_tx_issue_pending_all();
}
-static void complete_journal_encrypt(struct crypto_async_request *req, int err)
+static void complete_journal_encrypt(void *data, int err)
{
- struct journal_completion *comp = req->data;
+ struct journal_completion *comp = data;
+
if (unlikely(err)) {
if (likely(err == -EINPROGRESS)) {
complete(&comp->ic->crypto_backoff);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2023-02-14 0:05 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=20230214110521.77685fbb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=heinzm@redhat$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=snitzer@kernel$(echo .)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