From: Mark Brown <broonie@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christian Brauner <brauner@kernel.org>,
Keith Busch <kbusch@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shao Mingyin <shao.mingyin@zte.com.cn>
Subject: linux-next: manual merge of the block tree with the vfs-brauner tree
Date: Wed, 18 Nov 2026 14:53:55 +0000 [thread overview]
Message-ID: <av28A8BdSAcVJWk0@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/target/io-cmd-file.c
between commit:
054280c7786b6 ("nvmet: take freeze protection for writes to files")
from the vfs-brauner tree and commit:
bcd5316e708d4 ("nvmet: use overflow-safe range checks in the file backend")
from the block 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/nvme/target/io-cmd-file.c
index 083f4ffb9bd6e,3098b902f5198..0000000000000
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@@ -121,12 -117,19 +121,25 @@@ static void nvmet_file_io_done(struct k
nvmet_req_complete(req, status);
}
+static void nvmet_file_io_complete(struct kiocb *iocb, long ret)
+{
+ kiocb_end_write_iter(iocb);
+ nvmet_file_io_done(iocb, ret);
+}
+
+ static bool nvmet_file_check_lba_range(struct nvmet_req *req, u64 slba,
+ u64 len, loff_t *pos)
+ {
+ u64 pos64;
+
+ if (check_shl_overflow(slba, req->ns->blksize_shift, &pos64) ||
+ pos64 > req->ns->size || len > req->ns->size - pos64)
+ return false;
+
+ *pos = pos64;
+ return true;
+ }
+
static bool nvmet_file_execute_io(struct nvmet_req *req, int ki_flags)
{
ssize_t nr_bvec = req->sg_cnt;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-18 14:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 14:53 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-10-13 17:00 Mark Brown
2026-10-13 16:49 Mark Brown
2026-03-05 13:44 Mark Brown
2026-03-05 14:54 ` Christoph Hellwig
2026-03-05 15:18 ` Mark Brown
2026-03-05 17:34 ` Keith Busch
2026-03-06 14:22 ` Christoph Hellwig
2026-03-09 13:45 ` Jens Axboe
2026-03-09 13:48 ` Jens Axboe
2026-03-09 13:54 ` Jens Axboe
2026-03-10 6:26 ` Christoph Hellwig
2025-11-17 3:32 Stephen Rothwell
2024-06-28 17:59 Mark Brown
2024-06-28 17:59 Mark Brown
2024-06-29 10:05 ` Christian Brauner
2024-06-29 14:28 ` Jens Axboe
2024-05-08 3:02 Stephen Rothwell
2024-05-08 6:46 ` Christoph Hellwig
2024-04-02 0:21 Stephen Rothwell
2024-02-06 1:48 Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe
2024-02-07 9:27 ` Christian Brauner
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=av28A8BdSAcVJWk0@sirena.org.uk \
--to=broonie@kernel.org \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shao.mingyin@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®