| Message ID | 20230214110521.77685fbb@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the device-mapper tree with the crypto tree | expand |
diff --cc drivers/md/dm-integrity.c index c58156deb2b1,16aa68988363..000000000000 --- a/drivers/md/dm-integrity.c
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.