From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
"Darrick J. Wong" <darrick.wong@oracle•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Keith Busch <keith.busch@intel•com>
Subject: linux-next: manual merge of the akpm-current tree with the iomap tree
Date: Wed, 10 Jul 2019 18:25:30 +1000 [thread overview]
Message-ID: <20190710182530.0f26a159@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1527 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/iomap.c
between commit:
6610815a3343 ("iomap: move the page migration code into a separate file")
from the iomap tree and commit:
70b7f3cfceee ("mm: migrate: remove unused mode argument")
from the akpm-current tree.
I fixed it up (I rmeoved the file and applied the merge fix patch 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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 10 Jul 2019 18:21:35 +1000
Subject: [PATCH] mm: migrate: fix for fs/iomap.c splitting
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/iomap/migrate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/iomap/migrate.c b/fs/iomap/migrate.c
index a25874700f95..9ef266e27286 100644
--- a/fs/iomap/migrate.c
+++ b/fs/iomap/migrate.c
@@ -17,7 +17,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage,
{
int ret;
- ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0);
+ ret = migrate_page_move_mapping(mapping, newpage, page, 0);
if (ret != MIGRATEPAGE_SUCCESS)
return ret;
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-07-10 8:25 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=20190710182530.0f26a159@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=darrick.wong@oracle$(echo .)com \
--cc=keith.busch@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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