Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp2516552rda; Wed, 25 Oct 2023 05:16:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECvXlc0aZi+8CgumPRXhdvfedCQ4AF146Jl31xhfHBWHZwFYyXDcqmmUBrqIaMvOs5sjYP X-Received: by 2002:a05:6808:2029:b0:3b2:f192:5a6b with SMTP id q41-20020a056808202900b003b2f1925a6bmr17353675oiw.16.1698236196359; Wed, 25 Oct 2023 05:16:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698236196; cv=none; d=google.com; s=arc-20160816; b=L5mfikfhby7gDBwmjyOJR1vKaxwXIGOMdasieOqhorofGuo4YkowN59gKtsWlDCc6E 6rYQ1AsMpvOY/J/hPP+hkz+ftb5uxmaHNGgigqvXiaiy95ZQ+PxHcx/3QcKpkFj6XZyA r9G8I2KUD7Trdn9Lnce8NZyElngruJ4Tjo5UCDCd7x6MgoYLAz0xPglan5eTaxml3KIQ 78RgzM7dStvGp7CvpQt4Ko+zL0/QYXDNqJ8/94huhr6GfGqT1ueBJxwXOFa2wYCcnjPw d4hHUH9W/25ZOxRKozfpb68/Ba/aGuDpf2x5DLWxV1TWfhDdYk7vm1O9YJX8F/wjUTwY TmpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:to:subject:cc:user-agent:mime-version :date:message-id:dkim-signature; bh=opY1/2kgyFGOYWLc+OEiktY58mKFgw0ajyuLW8eLlDk=; fh=LcDBZ2/Ors6Kfyp0TsUpPq0cxrO+/OH/CI0Yx5JGTro=; b=Jg8B8D3qH08ieOKJTCrGc9UEEwz3XBukkR02amgqHlUXc0q7/FH9oFy7JkP64/V3gQ iKedfDJypf7gFSxacMb2HsmoJEedR/KEp+wS1id6XjGquZturKhc2EuSbKbvtiAzuBjY JiTKLDj/bpEZbGTcJ4NI7QJAUiC7ueLhkaBKEUcupGvH1X8aB3O3UT2ANNPmn1O1B7LK 1PI8A26IOQh4QDnoovtH+/pRmcb1HQY56U9g3nq2AFQGcdYYAtZ9EfFj4FBfNAXMNcqV /1fDKM0JCsMZ4HI70z4VIUgBOr4Q5/MGC6cNQx0ZhZWlrjN2Bq5HqTdMXdQKkSryW9Lt CAHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cCqI8tf4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id l136-20020a25cc8e000000b00da05c8b0c71si2943787ybf.295.2023.10.25.05.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 05:16:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cCqI8tf4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 50F508022E98; Wed, 25 Oct 2023 05:16:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234767AbjJYMQZ (ORCPT + 99 others); Wed, 25 Oct 2023 08:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234479AbjJYMQX (ORCPT ); Wed, 25 Oct 2023 08:16:23 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37458CE; Wed, 25 Oct 2023 05:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698236182; x=1729772182; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=tDzwyDjkaDc8TUEWuENwxjT1Dw93wCEeJpJVuaYZ1ps=; b=cCqI8tf4itA/7bmy2m3LSeAKBcVk51KfwRTBbok/YWTD96HRCIAb2+fE CwtkNG4VoyVaYFJqoNRk/QzgD3VfXfvuHdY2zfWvssCXZb6g1XMyeAqUR KTBbd+HAE4SABBFi1SWuCcayCNUoXNIxcyYj+VZuXxz5XYfrOIERwEj/M B+SL9afOPlgzFonNLHLEJ2XXS8YPFa2X2PQ6dpA4M7uSkMKwSeO7ZByfy LrM7dhT03Q5RccXdcrGGDRQ/5w5mgDGwkK6TrZnLwdT7Hzs83Yu1uq7eW d5LIOe77JU+6moszdTcmacZPc895dIJ6x/78Dh5x3/jWWNywbNe/7RmLE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="366641824" X-IronPort-AV: E=Sophos;i="6.03,250,1694761200"; d="scan'208";a="366641824" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 05:16:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="875482045" X-IronPort-AV: E=Sophos;i="6.03,250,1694761200"; d="scan'208";a="875482045" Received: from blu2-mobl.ccr.corp.intel.com (HELO [10.254.211.178]) ([10.254.211.178]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 05:16:19 -0700 Message-ID: <617cc452-2d31-4fe0-a808-a980baa43056@linux.intel.com> Date: Wed, 25 Oct 2023 20:16:16 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: baolu.lu@linux.intel.com, Joerg Roedel , Jacob Pan , Jiapeng Chong , Joao Martins , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree To: Jason Gunthorpe , Stephen Rothwell , Yi Liu , Kevin Tian References: <20231025153455.283c5b12@canb.auug.org.au> <20231025121212.GB3952@nvidia.com> Content-Language: en-US From: Baolu Lu In-Reply-To: <20231025121212.GB3952@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 25 Oct 2023 05:16:33 -0700 (PDT) On 2023/10/25 20:12, Jason Gunthorpe wrote: > On Wed, Oct 25, 2023 at 03:34:55PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the iommufd tree got a conflict in: >> >> drivers/iommu/intel/pasid.c >> >> between commit: >> >> c61c255e114c ("iommu/vt-d: Remove unused function") >> >> from the iommu tree and commits: >> >> f35f22cc760e ("iommu/vt-d: Access/Dirty bit support for SS domains") >> cbf8b441ea08 ("iommu/vt-d: Add helper to setup pasid nested translation") >> >> from the iommufd tree. >> >> I fixed it up (the latter added a use of the function removed by >> the former, so I just used the latter) and can carry the fix as >> necessary. This is now fixed as far as linux-next is concerned, but any >> non trivial > Intel folks, this is not nice ???? Why was the first commit done at all > if the nesting series needs this? It's my fault. My apologies for not realizing that the helper would still be used by the nesting translation series. I will be more careful in the future. Best regards, baolu