From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Andrew Morton <akpm@linux-foundation•org>
Cc: David Howells <dhowells@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Qian Yingjin <qian@ddn•com>
Subject: linux-next: manual merge of the block tree with the mm-hotfixes tree
Date: Mon, 13 Feb 2023 11:33:36 +1100 [thread overview]
Message-ID: <20230213113336.7867ec39@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
mm/filemap.c
between commit:
cfecbdbbbd86 ("mm/filemap: fix page end in filemap_get_read_batch")
from the mm-hotfixes tree and commit:
cd119d2fa647 ("mm: Pass info, not iter, into filemap_get_pages() and unstatic it")
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.
--
Cheers,
Stephen Rothwell
diff --cc mm/filemap.c
index 0e20a8d6dd93,6970be64a3e0..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -2588,8 -2591,7 +2591,8 @@@ int filemap_get_pages(struct kiocb *ioc
struct folio *folio;
int err = 0;
+ /* "last_index" is the index of the page beyond the end of the read */
- last_index = DIV_ROUND_UP(iocb->ki_pos + iter->count, PAGE_SIZE);
+ last_index = DIV_ROUND_UP(iocb->ki_pos + count, PAGE_SIZE);
retry:
if (fatal_signal_pending(current))
return -EINTR;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2023-02-13 0:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230213113336.7867ec39@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=qian@ddn$(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