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 for Android: free password hash cracker in your pocket

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

Message-ID: <20231103003335.GB4488@nvidia.com>
Date:   Thu, 2 Nov 2023 21:33:35 -0300
From:   Jason Gunthorpe <jgg@...dia.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Joerg Roedel <joro@...tes.org>,
        Joao Martins <joao.m.martins@...cle.com>,
        Joerg Roedel <jroedel@...e.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Nicolin Chen <nicolinc@...dia.com>, Yi Liu <yi.l.liu@...el.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree

On Fri, Nov 03, 2023 at 10:53:12AM +1100, Stephen Rothwell wrote:
> > I have used the conflict resolution below now.
> 
> This is now a conflict between the iommu tree and Linus' tree.

My PR has instructions for the resolution to both:

https://lore.kernel.org/linux-iommu/20231031131417.GA1815719@nvidia.com/

Thanks,
Jason