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, 6 Aug 2020 11:51:40 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Jason Gunthorpe <jgg@mellanox.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Ralph Campbell <rcampbell@nvidia.com>,
        Ben Skeggs <bskeggs@redhat.com>
Subject: Re: linux-next: manual merge of the hmm tree with the drm tree
Message-ID: <20200806115140.6aa46042@canb.auug.org.au>
In-Reply-To: <20200730192110.1466e63e@canb.auug.org.au>
References: <20200730192110.1466e63e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.=FcYe9T1r9uoFGqml0sKBG";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Thu, 30 Jul 2020 19:21:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the hmm tree got a conflict in:
>=20
>   drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c
>=20
> between commit:
>=20
>   7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages")
>=20
> from the drm tree and commits:
>=20
>   4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages")
>   1a77decd0cae ("nouveau: fix storing invalid ptes")
>=20
> from the hmm tree.
>=20
> 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch.
>=20
> I fixed it up (I just used the latter version) 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.

This is now a conflict between the drm tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/.=FcYe9T1r9uoFGqml0sKBG
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8rYiwACgkQAVBC80lX
0Gw7fAf+KnSav4Q90iErqeMElDcGjnp1gxUYGWuURo7kCjZP1pw2MQ/EgcbWntQF
aSSdUltwW6YFAgG/BqQwkyVXaO/mqDEPs+v3/MKcU8TGJ9gS9OWfHCE2AyACB1P7
R6iWtR8ZLu9Dfuis0grlwIiCVDjJRzmkUVliPuQ9LXBl9iccvKtGsl9OjgQEtpwn
QMR63J1pvjJmk7I/SZkUKXR7YYn//Jou1A7B/pFQZ9vryT8u/4En8BouJreW9reP
FCHH8C/N02/HN584YBXzoeG4FCwEVd4XWVtxfj326K8mE1yLOLY2AJRkNaidwx4d
vnEievjSwAUAuvAZUboFuZhyeiAV9A==
=89ZD
-----END PGP SIGNATURE-----

--Sig_/.=FcYe9T1r9uoFGqml0sKBG--