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=-4.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 35877C433E1 for ; Mon, 3 Aug 2020 23:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42DC02076E for ; Mon, 3 Aug 2020 23:29:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="diiBovFs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729185AbgHCX3q (ORCPT ); Mon, 3 Aug 2020 19:29:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59536 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729175AbgHCX3p (ORCPT ); Mon, 3 Aug 2020 19:29:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596497384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XRm3NJEvomEDfGeZbbN2TL8ZG4riiX42sSsKVhTtCDg=; b=diiBovFsoNAQkfLDC8XSHii9fPeBQYngoAZFwWSoF9nY0ToP6EjJtra8UznSJTEucimOA2 lqOWveYIiQaZwy75NrjXxm8Gk1zob+rNYsGosphQLnTKIg2swrHV92Kjv64cbj3Ni9Aoia nN+iGYc8xtZRdBn9P+Z/mZo0sj4sgTI= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-461-Tr62Da3DMnCCOH4aPuCFuA-1; Mon, 03 Aug 2020 19:29:42 -0400 X-MC-Unique: Tr62Da3DMnCCOH4aPuCFuA-1 Received: by mail-ed1-f70.google.com with SMTP id cz26so1156924edb.7 for ; Mon, 03 Aug 2020 16:29:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XRm3NJEvomEDfGeZbbN2TL8ZG4riiX42sSsKVhTtCDg=; b=V+ZpoRp3mS7RpnIRftcmnwkOYNXMpNP2CubcRYx3X/35LJ9rUpI/n3GquA4UrLTVPD svmD4cFcY7c7/2s/5sHgrGyPYu70GPVZhVp042RG2uOBqGuJZCSM4C5MFowNuXfAzI2n SWx37kUqVMaYghv7NUdriXH155pY3FEBfQg3u3O0L1VCpnz0RD0mpaMfX1fsHgDJ7OEK Km+zETv2t7uEDN2jqvePyo9/CA9l4oxLRFmJPa8WT0iCnqPlef0b59yudu4b0d93TUop wH9vPp36gZxeypXT9IA4Na1NFHoKdKIIqTsaa+uZyUHUvID+C3RnrjX4SkERID7lfqgk ICcA== X-Gm-Message-State: AOAM530S+9myZQk0/TqS/wNeg2vrEwbJ3IF5Nb1P+4lqn7juHJH0tzja GEbmCIUB7OTNNpdDv9p6h9omZaATmBFIK6nAXz1XLl8oCJvyYsy8P3/VjFIOZNggKjZIdTUSch+ hovd8KsYU30zBXKHGjapg7tTFFpoOe/avzFT6ng== X-Received: by 2002:a17:906:1104:: with SMTP id h4mr18840731eja.456.1596497381273; Mon, 03 Aug 2020 16:29:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp34p+Z8Mc6zwI3NcJv7oAfXkQvVK17vRb9paXv+mYpGH4EsJxZEwwVOS602UUu476FtjmqlNZsTpKWJyyYFw= X-Received: by 2002:a17:906:1104:: with SMTP id h4mr18840718eja.456.1596497381059; Mon, 03 Aug 2020 16:29:41 -0700 (PDT) MIME-Version: 1.0 References: <20200730192110.1466e63e@canb.auug.org.au> <20200730120303.GQ19097@mellanox.com> <20200803231923.GR19097@mellanox.com> In-Reply-To: <20200803231923.GR19097@mellanox.com> From: Ben Skeggs Date: Tue, 4 Aug 2020 09:29:30 +1000 Message-ID: Subject: Re: linux-next: manual merge of the hmm tree with the drm tree To: Jason Gunthorpe Cc: Ralph Campbell , Stephen Rothwell , Dave Airlie , DRI , Linux Next Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Aug 4, 2020 at 9:19 AM Jason Gunthorpe wrote: > > On Thu, Jul 30, 2020 at 10:31:45AM -0700, Ralph Campbell wrote: > > > > On 7/30/20 5:03 AM, Jason Gunthorpe wrote: > > > On Thu, Jul 30, 2020 at 07:21:10PM +1000, Stephen Rothwell wrote: > > > > Hi all, > > > > > > > > Today's linux-next merge of the hmm tree got a conflict in: > > > > > > > > drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c > > > > > > > > between commit: > > > > > > > > 7763d24f3ba0 ("drm/nouveau/vmm/gp100-: fix mapping 2MB sysmem pages") > > > > > > > > from the drm tree and commits: > > > > > > > > 4725c6b82a48 ("nouveau: fix mapping 2MB sysmem pages") > > > > 1a77decd0cae ("nouveau: fix storing invalid ptes") > > > > > > > > from the hmm tree. > > > > > > > > 7763d24f3ba0 and 4725c6b82a48 are exactly the same patch. > > > > > > Oh? Ralph? What happened here? > > > > Ben did email me saying he was planning to take this patch into > > his nouveau tree and I did reply to him saying you had also taken it > > into your tree and that I had more nouveau/SVM patches for you on the way. > > So, I'm not sure what happened. > > Well no answer from Ben and it looks like it is in the main DRM tree, > so I will drop the 4725c6b82a48 patch from hmm. My apologies, both for this slipping past me, and for the trouble. I did mean to drop that patch from my tree before sending it on to Dave. Ben. > > Jason >