From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
Christian Brauner <brauner@kernel•org>
Cc: Bart Van Assche <bvanassche@acm•org>,
Christoph Hellwig <hch@lst•de>,
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 scsi-mkp tree with the vfs-brauner tree
Date: Tue, 27 Feb 2024 15:34:36 +1100 [thread overview]
Message-ID: <20240227153436.33b48d59@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
fs/iomap/buffered-io.c
between commits:
dec3a7b3aa45 ("iomap: move the iomap_sector sector calculation out of iomap_add_to_ioend")
ae5535efd8c4 ("iomap: don't chain bios")
from the vfs-brauner tree and commit:
449813515d3e ("block, fs: Restore the per-bio/request data lifetime fields")
from the scsi-mkp tree.
I fixed it up (I think - 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 fs/iomap/buffered-io.c
index ae4e2026e59e,18e1fef53fbc..000000000000
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -1687,11 -1666,11 +1687,12 @@@ static struct iomap_ioend *iomap_alloc_
bio = bio_alloc_bioset(wpc->iomap.bdev, BIO_MAX_VECS,
REQ_OP_WRITE | wbc_to_write_flags(wbc),
GFP_NOFS, &iomap_ioend_bioset);
- bio->bi_iter.bi_sector = sector;
+ bio->bi_iter.bi_sector = iomap_sector(&wpc->iomap, pos);
+ bio->bi_end_io = iomap_writepage_end_bio;
+ bio->bi_write_hint = inode->i_write_hint;
wbc_init_bio(wbc, bio);
- ioend = container_of(bio, struct iomap_ioend, io_inline_bio);
+ ioend = iomap_ioend_from_bio(bio);
INIT_LIST_HEAD(&ioend->io_list);
ioend->io_type = wpc->iomap.type;
ioend->io_flags = wpc->iomap.flags;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-02-27 4:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 4:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 4:37 linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227153436.33b48d59@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=bvanassche@acm$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox