Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <2dea40af-af71-4ea6-b3db-fd0db17c9846@linux.intel.com>
Date:   Wed, 25 Oct 2023 20:25:19 +0800
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Cc:     baolu.lu@linux.intel.com, Stephen Rothwell <sfr@canb.auug.org.au>,
        Yi Liu <yi.l.liu@intel.com>, Kevin Tian <kevin.tian@intel.com>,
        Joerg Roedel <joro@8bytes.org>,
        Jacob Pan <jacob.jun.pan@linux.intel.com>,
        Jiapeng Chong <jiapeng.chong@linux.alibaba.com>,
        Joao Martins <joao.m.martins@oracle.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree
Content-Language: en-US
To:     Jason Gunthorpe <jgg@nvidia.com>
References: <20231025153455.283c5b12@canb.auug.org.au>
 <20231025121212.GB3952@nvidia.com>
 <617cc452-2d31-4fe0-a808-a980baa43056@linux.intel.com>
 <20231025121744.GD3952@nvidia.com>
From:   Baolu Lu <baolu.lu@linux.intel.com>
In-Reply-To: <20231025121744.GD3952@nvidia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 2023/10/25 20:17, Jason Gunthorpe wrote:
> On Wed, Oct 25, 2023 at 08:16:16PM +0800, Baolu Lu wrote:
>> 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.
> Can you send a revert of c61c255e114c ASAP to Joerg please?

Sure!

Best regards,
baolu