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:   Thu, 24 Sep 2020 16:45:29 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dan Williams <dan.j.williams@intel.com>,
        Al Viro <viro@ZenIV.linux.org.uk>
Cc:     Josh Poimboeuf <jpoimboe@redhat.com>,
        Vishal Verma <vishal.l.verma@intel.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the nvdimm tree with the vfs tree
Message-ID: <20200924164529.61ea980f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jwHNRXEmEeE4rEu/nXFGYKK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/jwHNRXEmEeE4rEu/nXFGYKK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  lib/iov_iter.c

between commit:

  e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculat=
ion")

from the vfs tree and commit:

  0a78de3d4b7b ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, =
kernel}()")

from the nvdimm tree.

I fixed it up (I just used the latter, but I suspect that more work is
needed) 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

--Sig_/jwHNRXEmEeE4rEu/nXFGYKK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9sQIkACgkQAVBC80lX
0Gyhlwf+LjOqtwQ3Vipamv9ks9ATKaj7h00KSJw0Ui2C0nNH8i+vZyFp3xLtEIpD
29gdr34GivCvHKTXpWSXG6PbORS3C7MAuiytoH9+yiI5zNst9zUNgnJncHQzCqgy
fMpBPq4b22qHQpO7CBWvqjaT9HPvBCP625ajUGUg6WLCrwEpAjEvBIacYJXhcN3w
XJlgAkq3qwrHOFmpAgBT0R+yt9TI96+F7lQq5MZjCcLKgslAS6aZ//TUmbLuSJL+
zMrWtj1PER+y5ZUPbAwGgTXN1LfS3SYgKbJ2UgngO5TElzw6aPsN3QC43MjPQ7WC
yy5xHn8GtQ6E+pldPfMMDh7h+M2ANA==
=r0vP
-----END PGP SIGNATURE-----

--Sig_/jwHNRXEmEeE4rEu/nXFGYKK--