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

Message-ID: <Y9eEjCsWUWeFccGd@suse.de>
Date:   Mon, 30 Jan 2023 09:49:16 +0100
From:   Joerg Roedel <jroedel@...e.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Joerg Roedel <joro@...tes.org>,
        Alex Williamson <alex.williamson@...hat.com>,
        Jason Gunthorpe <jgg@...dia.com>,
        Jason Gunthorpe <jgg@...pe.ca>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Niklas Schnelle <schnelle@...ux.ibm.com>
Subject: Re: linux-next: manual merge of the iommu tree with Linus' tree

Thanks for the report, Stephen.

Alex,

On Fri, Jan 27, 2023 at 02:13:30PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommu tree got a conflict in:
> 
>   drivers/vfio/vfio_iommu_type1.c
> 
> between commit:
> 
>   895c0747f726 ("vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()")
> 
> from Linus' tree and commit:
> 
>   1369459b2e21 ("iommu: Add a gfp parameter to iommu_map()")
> 
> from the iommu tree.

In case you want to fix this up in your tree, the patch-set causing this
is in a separate branch in the IOMMU tree which you can merge into your
tree:

	git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu-memory-accounting

Regards,

-- 
Jörg Rödel
jroedel@...e.de

SUSE Software Solutions Germany GmbH
Frankenstraße 146
90461 Nürnberg
Germany

(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman