linux-kernel - linux-next: manual merge of the iommu tree with the dmaengine-fixes 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>] [day] [month] [year] [list]

Message-ID: <20250516160521.6620f401@canb.auug.org.au>
Date: Fri, 16 May 2025 16:05:21 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Joerg Roedel <joro@...tes.org>, Vinod Koul <vkoul@...nel.org>
Cc: Joerg Roedel <jroedel@...e.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Lu Baolu <baolu.lu@...ux.intel.com>, Shuai
 Xue <xueshuai@...ux.alibaba.com>
Subject: linux-next: manual merge of the iommu tree with the dmaengine-fixes
 tree

Hi all,

Today's linux-next merge of the iommu tree got a conflict in:

  drivers/dma/idxd/init.c

between commit:

  a409e919ca32 ("dmaengine: idxd: Refactor remove call with idxd_cleanup() helper")

from the dmaengine-fixes tree and commit:

  853b01b5efd7 ("dmaengine: idxd: Remove unnecessary IOMMU_DEV_FEAT_IOPF")

from the iommu tree.

I fixed it up (the latter removed a subset of whe the former removed in
idxd_remove()) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped