Messages in this thread | | | Date | Mon, 7 Mar 2022 15:18:00 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the scsi tree with the block tree |
| |
Hi all,
Today's linux-next merge of the scsi tree got a conflict in:
drivers/block/drbd/drbd_worker.c
between commit:
472278508dce ("drbd: use bvec_kmap_local in drbd_csum_bio")
from the block tree and commit:
a34592ff6b78 ("scsi: drbd: Remove WRITE_SAME support")
from the scsi 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/block/drbd/drbd_worker.c index 1b48c8172a07,934bfb5d98d0..000000000000 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@@ -326,14 -326,9 +326,9 @@@ void drbd_csum_bio(struct crypto_shash bio_for_each_segment(bvec, bio, iter) { u8 *src; - src = kmap_atomic(bvec.bv_page); - crypto_shash_update(desc, src + bvec.bv_offset, bvec.bv_len); - kunmap_atomic(src); + src = bvec_kmap_local(&bvec); + crypto_shash_update(desc, src, bvec.bv_len); + kunmap_local(src); - /* REQ_OP_WRITE_SAME has only one segment, - * checksum the payload only once. */ - if (bio_op(bio) == REQ_OP_WRITE_SAME) - break; } crypto_shash_final(desc, digest); shash_desc_zero(desc); [unhandled content-type:application/pgp-signature] | |