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;