linux-kernel - Re: [PATCH] iommu: amd: Fix up merge conflict resolution

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

Message-ID: <ZGuJHu1hWBaM-8em@8bytes.org>
Date:   Mon, 22 May 2023 17:24:14 +0200
From:   Joerg Roedel <joro@...tes.org>
To:     Jerry Snitselaar <jsnitsel@...hat.com>
Cc:     linux-kernel@...r.kernel.org, iommu@...ts.linux.dev,
        Suravee Suthikulpanit <suravee.suthikulpanit@....com>,
        Will Deacon <will@...nel.org>,
        Robin Murphy <robin.murphy@....com>
Subject: Re: [PATCH] iommu: amd: Fix up merge conflict resolution

On Thu, Apr 20, 2023 at 12:20:13PM -0700, Jerry Snitselaar wrote:
>  drivers/iommu/amd/amd_iommu.h | 3 ---
>  1 file changed, 3 deletions(-)

Applied for 6.4, thanks.
s