From patchwork Tue Feb 14 00:05:21 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13139204
X-Patchwork-Delegate: herbert@gondor.apana.org.au
Return-Path: <linux-crypto-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 62222C636CC
	for <linux-crypto@archiver.kernel.org>; Tue, 14 Feb 2023 00:05:31 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229597AbjBNAFa (ORCPT <rfc822;linux-crypto@archiver.kernel.org>);
        Mon, 13 Feb 2023 19:05:30 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36158 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229652AbjBNAF3 (ORCPT
        <rfc822;linux-crypto@vger.kernel.org>);
        Mon, 13 Feb 2023 19:05:29 -0500
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B672A974E;
        Mon, 13 Feb 2023 16:05:26 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4PG1gQ1N2Qz4x4q;
        Tue, 14 Feb 2023 11:05:22 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1676333122;
        bh=CAzSLDb1dEbfnAtFmlA4dMrg04aRPe2Txx15eZN3dho=;
        h=Date:From:To:Cc:Subject:From;
        b=Xr1i8k3oBTZ/5Pqc6KY0CKqYw6LZyBYLX+8RnitJYdvMsMhKlmR+wmfGruokDjLBN
         oGjjRoJhBxkMd8+PcQTMrVLr7PeczeOph2t8tsl5YK4ES5jU8XnlW1Xl3BWmUnlbbR
         n1bITYE1TZnxne270aV+7aveDBtrdId5ntM64X8n9DqIta0WCrue8HgTu5MyxY3g7Y
         OmtkURPc8KQRwXFk/O8Tl13wPGIW/Hq034e46K/kBZYs34bEVFqcZ48IIL/e/JL0nM
         qIjlm7XqUtVPBSxEksZtcJLWgHdz9ZiXgGmIXAKKgK/nHqqg/klhOj8lxYgCO9b3ki
         LIEFydIxCmiQQ==
Date: Tue, 14 Feb 2023 11:05:21 +1100
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
Message-ID: <20230214110521.77685fbb@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

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.

diff --cc drivers/md/dm-integrity.c
index c58156deb2b1,16aa68988363..000000000000
--- a/drivers/md/dm-integrity.c