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

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

Message-ID: <3eca1508-b012-9c9d-d5cf-678ce3dd8665@amd.com>
Date:   Fri, 21 Apr 2023 11:49:22 +0530
From:   Vasant Hegde <vasant.hegde@....com>
To:     Jerry Snitselaar <jsnitsel@...hat.com>,
        linux-kernel@...r.kernel.org, iommu@...ts.linux.dev
Cc:     Joerg Roedel <joro@...tes.org>,
        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 4/21/2023 12:50 AM, Jerry Snitselaar wrote:
> Merge commit e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next")
> added amd_iommu_init_devices, amd_iommu_uninit_devices,
> and amd_iommu_init_notifier back to drivers/iommu/amd/amd_iommu.h.
> The only references to them are here, so clean them up.
> 
> Fixes: e17c6debd4b2 ("Merge branches 'arm/mediatek', 'arm/msm', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'x86/vt-d' and 'x86/amd' into next")
> Cc: Joerg Roedel <joro@...tes.org>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@....com>
> Cc: Will Deacon <will@...nel.org>
> Cc: Robin Murphy <robin.murphy@....com>
> Signed-off-by: Jerry Snitselaar <jsnitsel@...hat.com>

Thanks for the fix.

Reviewed-by: Vasant Hegde <vasant.hegde@....com>

-Vasant