linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20221104152434.7233ed45@canb.auug.org.au>
Date:   Fri, 4 Nov 2022 15:24:34 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jason Gunthorpe <jgg@...dia.com>, Joerg Roedel <joro@...tes.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the iommufd tree with the iommu tree

Hi all,

Today's linux-next merge of the iommufd tree got conflicts in:

  drivers/iommu/iommu.c
  include/linux/iommu.h

between commits from the iommu and iommufd trees.

I don't have time to disentangle this, so I have just dropped the iommufd
tree for today.  Please coordinate.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped