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=-6.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 00560C433DF for ; Thu, 30 Jul 2020 17:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D472320809 for ; Thu, 30 Jul 2020 17:31:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="IDllqmel" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730205AbgG3Rbx (ORCPT ); Thu, 30 Jul 2020 13:31:53 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:1305 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730199AbgG3Rbw (ORCPT ); Thu, 30 Jul 2020 13:31:52 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 30 Jul 2020 10:31:06 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 30 Jul 2020 10:31:52 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 30 Jul 2020 10:31:52 -0700 Received: from rcampbell-dev.nvidia.com (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 30 Jul 2020 17:31:45 +0000 Subject: Re: linux-next: manual merge of the hmm tree with the drm tree To: Jason Gunthorpe , Stephen Rothwell , Ben Skeggs CC: Dave Airlie , DRI , Linux Next Mailing List , "Linux Kernel Mailing List" References: <20200730192110.1466e63e@canb.auug.org.au> <20200730120303.GQ19097@mellanox.com> From: Ralph Campbell Message-ID: Date: Thu, 30 Jul 2020 10:31:45 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200730120303.GQ19097@mellanox.com> X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1596130266; bh=k4vNNiKstW6Z4KOTz1fqT9YxUmyKEbjWauOw7RAdy6E=; h=X-PGP-Universal:Subject:To:CC:References:From:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:X-Originating-IP: X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=IDllqmel5uIxCRjyj3mE7PtQjbfdPLAHQaKS7JSlcufXQnN0y2wr9uNpduQmM5RrJ DxzkaWGYixjZ+7++WSnROrAz3JQ3PSagZWwfKQzu1JnTOBWOGOeHtssYrwZpALTrN0 qhdmTSvdkX+jNESbUszk6fWDe1c5xsOT13/gNEINM+faqNkqqGbtr0zycn7+lNiweS M9mMWebWrxVBt8GQGc6KU9KJBVlueykDJk/COiuW0lgjClzIuxbbs++nOYHW8llTvT O9+y7MGd8SlBYOL0G/08vXb6g0g+SoVCzw7djjwc0r/ka1lZCwWT+ZytK7Tb8mF2Zd fesOHI2MS7mtQ== Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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. > Ben can you drop 7763d24f3ba0 ? > > Jason >