Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Wed, 25 Oct 2023 09:17:44 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Baolu Lu <baolu.lu@linux.intel.com>
Cc:     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
Message-ID: <20231025121744.GD3952@nvidia.com>
References: <20231025153455.283c5b12@canb.auug.org.au>
 <20231025121212.GB3952@nvidia.com>
 <617cc452-2d31-4fe0-a808-a980baa43056@linux.intel.com>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <617cc452-2d31-4fe0-a808-a980baa43056@linux.intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RVVYWXdpMW1TWXZQdFRzcExyaDgxWlBuRzU2d3lDRGYxaEY1WGErR1Y0UE1I?=
 =?utf-8?B?cklpa0RlR1RnZmhMTzFWNEE5ck9YcXRnVTZKYWpENmtGL1d0SVpZSlFlN1ho?=
 =?utf-8?B?N0pBSkxZMDlJVUZOMk5aZHhiSjVjcmtnVURwZi9hcjd4aHdVNjR1NGRrVTlP?=
 =?utf-8?B?WDZ4M2RzQ0FhYkR2L1J3VFptOHlrVWxtZTRpb0k0cjNlQllycTNpM1oyUEJE?=
 =?utf-8?B?WUFqM0ZCaGJVNEF2VElwREViUWt6bUlBUUQrMldYU1FoNUFQU1J1Y2xSa0VE?=
 =?utf-8?B?aDFocVFjTnZxZTU2TE5DdTdxd2dmUXlyZGU2b2pvTVRiRDlINC9YdGkyRkZQ?=
 =?utf-8?B?VkRCYzJic0VPYnJoM1c5ZGFYMkNGRTFrQXpQRTdvS3VWdy9VT2ZmM01GNlZZ?=
 =?utf-8?B?UVozMnUzM051bnRvRDRoTDl1VkFsTTQvUVVraDc4Szd0SmhZbUk1OFpxc3lv?=
 =?utf-8?B?NjhmU0lXVGJZU1p2T2lXTEdsSk5lNHRVM2pDa0dORDJZcy9RcTJUM0tENnJi?=
 =?utf-8?B?L0RYOWtjbC9kVGRkWWYvaCs0Zk55WWNFRkx3cDRPQmt0UmNkbFBNdDVWWC8v?=
 =?utf-8?B?N01wNENLc0NJUmFyOHlSL2t3djMyTGpPNWl5TWVJUDA4M2lCQmFyM2wvS2dC?=
 =?utf-8?B?bjFmMGI5OFh4L2dPZnpZYm54YnFVQjIwd3g2WEd6WGxOZDZLdDRnVWJZcW9X?=
 =?utf-8?B?NDg5aXBrUndXSmIvSTkyL1NnRyt4R2tuamZzdzVLbUorR2Y5Y3gzRlE2YUc3?=
 =?utf-8?B?MDI3L0JDOWhsNm9iV1FrRzA2UFkxNk4va0N6a2pUY2Z6MTV6YUt1aDNnYytV?=
 =?utf-8?B?eEJ6VmxmT0w5T0NybGZGNTEzeDJjRkNQNXJPUTJYdlA0VHJ5UFYwQklHRlNm?=
 =?utf-8?B?TStGaGJUTUN5Qlh1bnVWaFJzMTlrT1lmZk9Wei83UmZwOUx5bWpjN0sxYzQv?=
 =?utf-8?B?c3YxQmlZd1VLV0FIcTJBU2JzMnNhWWw0cW5JemY1RUxySEloQzI3WXF3TjhN?=
 =?utf-8?B?U3RGeC9XTEtpUVFjb0pDejhnSTRzZW52bTRpc1cyekdsRCt3RXhkTncrcTl4?=
 =?utf-8?B?M0l5VUxKQmJBVWNuZkhFeHErRlQxOVgyODY0N0tVNnR5U0NQNDd2ai9BYnhM?=
 =?utf-8?B?S0dkM2tjc0l0ZWVoREZBNEZNaENIZ0xDNHhaU0VoUk5NbUZoNjdOaGdBcmIv?=
 =?utf-8?B?T2syeFNnODkzQVBPT2FOc09sbFp5dDFBdzVRaEFZSDVSb0RiMlJDd3l0Mzha?=
 =?utf-8?B?d0lnTXZzWUExQlg1SDZYNkx5enozQlhUYUduZS8vaUpTMFpXKzNCSlk0SEdG?=
 =?utf-8?B?aXhld1ZUSkJ1ZU9JclNxUmVmOFBYTVNvbUdnakNDbjBsSS9jYUFoVHAyVGVa?=
 =?utf-8?B?KzZDY0U1YlFoSWJrZzlSK2RSejdnT1dSbHNTMXA5MUJPNW9hM1NZZEh4endY?=
 =?utf-8?B?VTQzTlRZY053TEZZOS9VQkJudGN2WlZvMmRvTTdBZXFQK0JXbGFuVjUxUFJz?=
 =?utf-8?B?Vk4zNTVtZnc1dkZnMWhYTWE2T3V1V2dzVEZZck5UazZ4VWE2WXhxajJsRXNm?=
 =?utf-8?B?STBhOFMyblp3ZU14UVZVamJ4dFpFcFdNQkJRaS81WEt4Q0NtZXUwNi91cnFH?=
 =?utf-8?B?RGREK0U5RlZvRHcvYS80SWVzK21FRXBjT3dlQkR2U1NLUGcvUWc3QTBDb0xK?=
 =?utf-8?B?ZHU5ZitIdkhnOTcxVFdFYzhjcm1FREpkZFJUdEpzN3I2Y3B5cmt2WTkyUDFX?=
 =?utf-8?B?cmJJWXQySkRZN0ZXN0VWWlRON2JYS2FHY2dJVkd2MVArZWNob3ZiUHYwdWRN?=
 =?utf-8?B?WUlUT2JLWkMyTDRXN2t4N2RUVWlCcVNKY2ZIcElPNC93SkZtNlB5RDBGdzJ0?=
 =?utf-8?B?VkVnNDFYTzA4ck5JOXlkKzNqcEYzajJCbXFXOVFocktXZ080Q1lzWFpnd0tm?=
 =?utf-8?B?SGZXdG1nTWQvckllK2RoWmZrUVJqNk5wa2VGSWVoOEhRc0hMNHBwUHBlUXh0?=
 =?utf-8?B?bDRyL1MxT3hRZWdCVnhmUis1RHRLRHB6OWJzV3lLayt6NFBWaXJaQ1YrUEp1?=
 =?utf-8?B?WHNNMW5kanFuckRBTElPWFFxc3RmTnVneEZKdU12MHFMR0pLeG5yVmh1b2lL?=
 =?utf-8?Q?/EOJgsk/I6IeYyLzbArmeuPs/?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5b2524b5-597b-4eaf-b951-08dbd5546575
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 12:17:46.0313
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oFdowPtqCKT4Lc6DOBGl4MqHzaZKveF+tRMkYMo5YUjDmPIDynKBM/rqfPHzOYZL
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7645
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,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 groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 25 Oct 2023 05:18:12 -0700 (PDT)

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?

Jason