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>
