linux-kernel - linux-next: manual merge of the device-mapper tree with the origin tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20220805125744.475531-1-broonie@kernel.org>
Date:   Fri,  5 Aug 2022 13:57:44 +0100
From:   broonie@...nel.org
To:     Alasdair G Kergon <agk@...hat.com>,
        Mike Snitzer <snitzer@...nel.org>
Cc:     Kees Cook <keescook@...omium.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Matthias Kaehlcke <mka@...omium.org>,
        Nathan Huckleberry <nhuck@...gle.com>
Subject: linux-next: manual merge of the device-mapper tree with the origin tree

Hi all,

Today's linux-next merge of the device-mapper tree got a conflict in:

  drivers/md/dm-verity-target.c

between commit:

  b6c1c5745ccc6 ("dm: Add verity helpers for LoadPin")

from the origin tree and commits:

  ba2cce82ba1ba ("dm verity: conditionally enable branching for "try_verify_in_tasklet"")
  5721d4e5a9cdb ("dm verity: Add optional "try_verify_in_tasklet" feature")

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-verity-target.c
index 4fd853a56b1ab,981821f18a18c..0000000000000
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@@ -16,6 -16,6 +16,7 @@@
  #include "dm-verity.h"
  #include "dm-verity-fec.h"
  #include "dm-verity-verify-sig.h"
++#include <linux/jump_label.h>
  #include <linux/module.h>
  #include <linux/reboot.h>
  #include <linux/scatterlist.h>