Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 12 Feb 2021 10:38:10 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>, David Howells <dhowells@redhat.com>
Cc:     David Sterba <dsterba@suse.com>, Ira Weiny <ira.weiny@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the btrfs tree with the fscache tree
Message-ID: <20210212103810.170b93e8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1Sl9RCN.B0FAd1HbN=/XHgv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1Sl9RCN.B0FAd1HbN=/XHgv
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  lib/iov_iter.c

between commit:

  11432a3cc061 ("iov_iter: Add ITER_XARRAY")

from the fscache tree and commit:

  325a835476e3 ("iov_iter: Remove memzero_page() in favor of zero_user()")

from the btrfs 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.

--=20
Cheers,
Stephen Rothwell

diff --cc lib/iov_iter.c
index 24413884b5ca,aa0d03b33a1e..000000000000
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@@ -1048,9 -961,8 +1028,9 @@@ size_t iov_iter_zero(size_t bytes, stru
  		return pipe_zero(bytes, i);
  	iterate_and_advance(i, bytes, v,
  		clear_user(v.iov_base, v.iov_len),
- 		memzero_page(v.bv_page, v.bv_offset, v.bv_len),
+ 		zero_user(v.bv_page, v.bv_offset, v.bv_len),
 -		memset(v.iov_base, 0, v.iov_len)
 +		memset(v.iov_base, 0, v.iov_len),
- 		memzero_page(v.bv_page, v.bv_offset, v.bv_len)
++		zero_user(v.bv_page, v.bv_offset, v.bv_len)
  	)
 =20
  	return bytes;

--Sig_/1Sl9RCN.B0FAd1HbN=/XHgv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAlv+IACgkQAVBC80lX
0Gwbwgf+Lw3uRQsaf2tqcI/JmSjSRPpAVKUbb9w52fT5GU6SpKA384D/z9mS0HBE
LxWtPCQOIMJU9nvfNdpGLPrFW9hsRL6OwSchiaZvO+EVLNuiZuLOtsbk5WZCZQvV
GAA22GwjY44umWOxKIbDc6+Dr2c049eLu7assumVni917pVrKdCRzccWhW6vHDzR
/7wLvZk4qHJZ8VMibqxgmirv7IXL0Dkn05sH0mDtgmkLawH+U1S4EVKc7GCTixAy
f24Y28JYwDnVEBLIQULvI8l7SPNbSlgHtqRLBf+dLyCH+6/c1PoG0oyKnO0FqG9s
TI1WO/Ky6sU/AsFpTqdUbQDf8/1RNw==
=auiZ
-----END PGP SIGNATURE-----

--Sig_/1Sl9RCN.B0FAd1HbN=/XHgv--