Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 27 Feb 2020 14:11:48 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Janosch Frank <frankja@linux.ibm.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Claudio Imbrenda <imbrenda@linux.ibm.com>,
        John Hubbard <jhubbard@nvidia.com>
Subject: linux-next: manual merge of the akpm-current tree with the kvms390
 tree
Message-ID: <20200227141148.05d7d502@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GX7+R1ByaTc96Id/6+oIct9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/GX7+R1ByaTc96Id/6+oIct9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  mm/gup.c

between commit:

  732b80e677b8 ("mm/gup/writeback: add callbacks for inaccessible pages")

from the kvms390 tree and commit:

  9947ea2c1e60 ("mm/gup: track FOLL_PIN pages")

from the akpm-current tree.

I fixed it up (see below - maybe not optimally) 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.

--=20
Cheers,
Stephen Rothwell

diff --cc mm/gup.c
index 354bcfbd844b,f589299b0d4a..000000000000
--- a/mm/gup.c
+++ b/mm/gup.c
@@@ -269,18 -470,11 +468,19 @@@ retry
  		goto retry;
  	}
 =20
+ 	/* try_grab_page() does nothing unless FOLL_GET or FOLL_PIN is set. */
+ 	if (unlikely(!try_grab_page(page, flags))) {
+ 		page =3D ERR_PTR(-ENOMEM);
+ 		goto out;
+ 	}
 +	if (flags & FOLL_GET) {
- 		if (unlikely(!try_get_page(page))) {
- 			page =3D ERR_PTR(-ENOMEM);
- 			goto out;
- 		}
 +		ret =3D arch_make_page_accessible(page);
 +		if (ret) {
 +			put_page(page);
 +			page =3D ERR_PTR(ret);
 +			goto out;
 +		}
 +	}
  	if (flags & FOLL_TOUCH) {
  		if ((flags & FOLL_WRITE) &&
  		    !pte_dirty(pte) && !PageDirty(page))

--Sig_/GX7+R1ByaTc96Id/6+oIct9
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5XM3QACgkQAVBC80lX
0Gxbrwf/QMaJBJLbG8u0mjOZR+stuPMQ5XeLc3F0RdgSbb6OOG3TWsvaSutk6WSI
P0d8yxNW5FbFe/Bk9aWekvpl75nUEhxqv9TosNEmTDo58PmZ6XNZ1N74Tiy6oHTP
cqgwVc7G1kG/iSv4w8A2GZjqiaZMcgUexEWfG4FessQdUsZ8eyapYWZfiZqwDg4A
ec5zYwqtse/hcvKHgDd0QdFhqzXdnp+/LtwZ1WDRAKeL0n5XPkRWtI6uPduDhttH
J9MVJmlC8Z6Q4xtnsbjBWA7EyIrL5egzuCW9lO2dqWQCWUJVh6f73g9eJW3fAiSO
PxsqoKewipY27I3WpObTzXNHYwGKXA==
=f+KP
-----END PGP SIGNATURE-----

--Sig_/GX7+R1ByaTc96Id/6+oIct9--