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:   Mon, 15 Jul 2019 23:21:20 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@mellanox.com>
Cc:     Dave Airlie <airlied@gmail.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        dri-devel <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Jerome Glisse <jglisse@redhat.com>,
        Thomas Hellstrom <thellstrom@vmware.com>
Subject: Re: DRM pull for v5.3-rc1
Message-ID: <20190715232120.18d2c8c0@canb.auug.org.au>
In-Reply-To: <20190715122924.GA15202@mellanox.com>
References: <CAPM=9tzJQ+26n_Df1eBPG1A=tXf4xNuVEjbG3aZj-aqYQ9nnAg@mail.gmail.com>
        <CAPM=9tx+CEkzmLZ-93GZmde9xzJ_rw3PJZxFu_pjZJc7KM5f-w@mail.gmail.com>
        <20190715122924.GA15202@mellanox.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/VW_C7TdGe9E+EtWOg93jd33"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/VW_C7TdGe9E+EtWOg93jd33
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Jason,

On Mon, 15 Jul 2019 12:29:28 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> On Mon, Jul 15, 2019 at 04:59:39PM +1000, Dave Airlie wrote:
>=20
> >      going with it for now until I get push back). They conflicted
> >      with one of the mm cleanups in the hmm tree, I've pushed a
> >      patch to the top of my next to fix most of the fallout in my
> >      tree, and the resulting fixup is to pick the closure->ptefn
> >      hunk and apply something like in mm/memory.c =20
>=20
> Did I mess a notification from StephenR in linux-next? I was unwaware
> of this conflict?

That conflict was with Andrew's akpm-current tree, not the hmm tree ...

(on June 24)

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

  mm/memory.c

between commit:

  29875a52915e ("mm: Add an apply_to_pfn_range interface")

from the drm tree and commit:

  e972cea08fb3 ("mm/pgtable: drop pgtable_t variable from pte_fn_t function=
s")

from the akpm-current tree."

--=20
Cheers,
Stephen Rothwell

--Sig_/VW_C7TdGe9E+EtWOg93jd33
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0sfdAACgkQAVBC80lX
0GwXWQf+JoydCHiGtYJAiKoodhkxfj5Tv12MQFrM61Vj8TXMiH8047YuRQ1/nIRQ
KgL8i/l6KpXDAkcB3PKqdI8b6Mk2JhDSe5+z4WE2s/dAsHphBsrU+fyqTuByZm5s
PwHS9nqqK2UzsOOJN+15MH6VDieVzyOqUgAqdZep2EkUaRkstXYkSaWuCfQcOXQF
yqnB/NPgQ04RZhUTFf9v1JpUhU/LvDMkQz2YWOEL+LemzE9rE3CT++aPXB2zw5EE
bu9UToeusFqyiEPxIOo937xj+8hbtedzxEZlVs+S1jFpUkLy6wkV13ELG8mWIYOE
4dqb9BWTXC0xVpvIN/AVo4xYpqKDBA==
=3QeO
-----END PGP SIGNATURE-----

--Sig_/VW_C7TdGe9E+EtWOg93jd33--