From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EC8FC76191 for ; Mon, 15 Jul 2019 13:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CBA9206B8 for ; Mon, 15 Jul 2019 13:21:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="d80lYJjW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730208AbfGONV0 (ORCPT ); Mon, 15 Jul 2019 09:21:26 -0400 Received: from ozlabs.org ([203.11.71.1]:47433 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730111AbfGONVZ (ORCPT ); Mon, 15 Jul 2019 09:21:25 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45nPLT6CQjz9sBF; Mon, 15 Jul 2019 23:21:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1563196883; bh=AA15GNxzRcD/Gft7h69NVL53UNTyAKxicfRiGRl7Er4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=d80lYJjWekSjCPVKaVb1uWeIQd8a28XjaegeSiFCYBNnxXzfs4MMzPwxNlcWmhPsA 8Waycfa9hZgS6vx1btcziQG07IEws3GBoA0GxRHRviISkhB0Ez7HLZagmuHHPhgJTn hP1sX2i/FnrErv6YBCTUIAiMSyxWaEIQclJOi72Nt1k/UBWVE1G76carXeNLZMSzio DZWWxqbbbVh8zx7O452Khr6v6bcoFEd3nAQzWU91LZ2XcdbUVlVM+0nevtUSoz0cN3 v53ITbc5XTi4u33Zz4xE5IolqFGD0d8/sk9sExEavxEBYd6c4CyTYrt93gEMv8Zwns T6YKb3rHMPJig== Date: Mon, 15 Jul 2019 23:21:20 +1000 From: Stephen Rothwell To: Jason Gunthorpe Cc: Dave Airlie , Linus Torvalds , Daniel Vetter , dri-devel , LKML , Andrew Morton , Jerome Glisse , Thomas Hellstrom Subject: Re: DRM pull for v5.3-rc1 Message-ID: <20190715232120.18d2c8c0@canb.auug.org.au> In-Reply-To: <20190715122924.GA15202@mellanox.com> References: <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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --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 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--