Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Date:   Wed, 25 Oct 2023 09:12:12 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Lu Baolu <baolu.lu@linux.intel.com>,
        Yi Liu <yi.l.liu@intel.com>, Kevin Tian <kevin.tian@intel.com>
Cc:     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: <20231025121212.GB3952@nvidia.com>
References: <20231025153455.283c5b12@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231025153455.283c5b12@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VvrYcQjN6z4usbmxIC7sWAj+PBMTpsL3ieBlsCZ+dkq5NFrMr/n/8up3BWgV?=
 =?us-ascii?Q?NA2hAUt+hWg0rFmYtjCbC4Kq2lOm4LEpcnt5k8Ze3qj38eu0Pgo0X6hLxT93?=
 =?us-ascii?Q?sT7tfKUHoxHV/8JwD18BfWBncsNXkVYMMt/k+nUb8hlI/0woB+Uyti+No45P?=
 =?us-ascii?Q?oq4dYz3xMs0WFQUbVqUBVVy+zQka7blK9eF3N2wCCHYQ4zN9pAm9C3sUTEYp?=
 =?us-ascii?Q?9QETZQH0Z/SM5ixFXuarcz4h3XunOTlRESDmNwj+RTv641ePkoHcC9mkWuW+?=
 =?us-ascii?Q?0+JAeINggjq43V6Wd5IuHz0w/VblfHQkQp5q2Hd8P3zcQjojBN9gJMBHQYAW?=
 =?us-ascii?Q?mhYClb+fF6gLirHfOh2HOlTrEk0YQrreYMCWFtcTW0z9vxzkOSUJQalAar+8?=
 =?us-ascii?Q?SV2wyVPZDAvt3mdExKn+F7FEf2CqWRvjKxFBFjTyNsl8zM0HYgoBiX2AddWk?=
 =?us-ascii?Q?wnc8zFn/98V52zI4pkDF3I/smHlexirjrfwhfPP6eL0vHN0KKKyeahyPn2Es?=
 =?us-ascii?Q?LqMCX4p1LhDGK2n/3JaOpp86ePGGeyWCeKb5g58WYEY6zKppNruJnP5DvqYs?=
 =?us-ascii?Q?HLb/6eN7qpdq2Cwf48ZZ8Q4kupjSj8wLGaacYtxGROd2OHuyQs44bboiV547?=
 =?us-ascii?Q?ZRiWLYEodWqAMGr0ZLdMfxvfftqxkyelFzTEYcbKhFs4yWOp/RM/43yyTHRe?=
 =?us-ascii?Q?PqiCRP5y3fSxbNrBGPeZRMEogUQ7+lB/PF+1nemjNS5hWkAkOdGSln2hpMfF?=
 =?us-ascii?Q?bjTqq2aJu9B0l6wOsdOURMPdQ5QCOhP4siOuD77cor4ZYAV9XA9MhXnPxbS7?=
 =?us-ascii?Q?uG0uI0KekBn2yOWlmf5T6bAjcE7BD7XKFQOwXPuR1GU7whXzgceeX1wsQ7su?=
 =?us-ascii?Q?JBBHqKjcWh6vI2B4XYbiEJHrk3o1PaX/X2nyiMotbibnQAsAetkDXYnHsTSx?=
 =?us-ascii?Q?zMpCMQFkKhvm5dmPtocH5ud7++CfZCff3SYW6sW8Oc7SEUx3L6Jq9ubWXBlk?=
 =?us-ascii?Q?cK7RfPdPWTmSlVCRvDeTMX+XN18CLLBBLPZm0qoB0T2vl9S59MEBNfR9nUwV?=
 =?us-ascii?Q?Wf1FKDebs9aZ/ueJHWI9ra1tNO/LDVorULtvdGXEUjvF7M2cDNcNnukNlUBB?=
 =?us-ascii?Q?PNqU18r6rHePAEsvtuyImq9UzmbceoC+wVIPI1lrjLD7+I4WW3KdX1sQhVAB?=
 =?us-ascii?Q?/hpnNQW0GWim/1AD9/TiqurztZsSwbuxwhXX2xHeluDq86ZrBJGGjZAsELfx?=
 =?us-ascii?Q?RLXHa6aBll5bRWmJHzKQzgxbxmjbe+U0V34rWI5bLky+982D7ghuC+3fke+u?=
 =?us-ascii?Q?xhuetOVMJhUADqHfmhxCjhg+9BlNrAEQyNyz8Bok2cMxk35ZDW1xeVSVCDfQ?=
 =?us-ascii?Q?lqwZ3riD/5DtN4X+/quCa3HS9zwunjm3RdDrVuvtwFWo2dylI9fM8afb3q9u?=
 =?us-ascii?Q?HhL1J1uqW1bb3aOrPWG7b+InSyTRPy5gZSmo97grEgIH+sYHs+K696CAbWNz?=
 =?us-ascii?Q?yRaIvaZd6L6QHg0C6/iD1Vef/ZsnfAAcAKOkpKGSO4+5JKVeiTuvLPpWDfFH?=
 =?us-ascii?Q?mwwZNFNP4+VDcI1fbgj0SdULRUnl730li+6Lh3h0?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c3c01a1a-aa5e-418c-89c1-08dbd5539f94
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:12:14.0325
 (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: MoQm71dBYfeE/g4vNUtPKWrAeKilN8Vqal83F3gf2JuvIyObBL70DoKhXk0szpjd
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5741
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:12:43 -0700 (PDT)

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?

Thanks Stephen, it looks good
Jason