linux-kernel - Re: linux-next: manual merge of the iommufd tree with the iommu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250630130234.GT167785@nvidia.com>
Date: Mon, 30 Jun 2025 10:02:34 -0300
From: Jason Gunthorpe <jgg@...dia.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Joerg Roedel <joro@...tes.org>, Joerg Roedel <joerg.roedel@....com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Nicolin Chen <nicolinc@...dia.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree

On Mon, Jun 30, 2025 at 04:00:59PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommufd tree got a conflict in:
> 
>   include/linux/iommu.h
> 
> between commit:
> 
>   792ea7b6cafa ("iommu: Remove ops->pgsize_bitmap")
> 
> from the iommu tree and commits:
> 
>   187f146d5de6 ("iommu: Introduce get_viommu_size and viommu_init ops")
>   f842ea208e43 ("iommu: Deprecate viommu_alloc op")
> 
> from the iommufd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks right, thanks

Jason