linux-kernel - linux-next: manual merge of the akpm-current tree with the iomap tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190710182530.0f26a159@canb.auug.org.au>
Date:   Wed, 10 Jul 2019 18:25:30 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        "Darrick J. Wong" <darrick.wong@...cle.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Keith Busch <keith.busch@...el.com>
Subject: linux-next: manual merge of the akpm-current tree with the iomap
 tree

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@...b.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@...b.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

Content of type "application/pgp-signature" skipped