linux-kernel - linux-next: manual merge of the iommu tree with the pci 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: <aYkjRSFQwbF0-9vi@sirena.co.uk>
Date: Sun, 8 Feb 2026 23:59:01 +0000
From: Mark Brown <broonie@...nel.org>
To: Joerg Roedel <joro@...tes.org>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>,
	Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	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: linux-next: manual merge of the iommu tree with the pci tree

Hi all,

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

  drivers/pci/pci.c

between commit:

  183c291caa34cc ("PCI: Use lockdep_assert_held(pci_bus_sem) to verify lock is held")

from the pci tree and commit:

  f5b16b802174fe ("PCI: Suspend iommu function prior to resetting a device")

from the iommu 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.

diff --cc drivers/pci/pci.c
index f7630fb3092857,a0ba42ae7ee01e..00000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -13,7 -13,7 +13,8 @@@
  #include <linux/delay.h>
  #include <linux/dmi.h>
  #include <linux/init.h>
+ #include <linux/iommu.h>
 +#include <linux/lockdep.h>
  #include <linux/msi.h>
  #include <linux/of.h>
  #include <linux/pci.h>

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)