From: Vasant Hegde <vasant.hegde@amd.com>
To: Jerry Snitselaar <jsnitsel@redhat.com>,
linux-kernel@vger.kernel.org, iommu@lists.linux.dev
Cc: Joerg Roedel <joro@8bytes.org>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH] iommu: amd: Fix up merge conflict resolution
Date: Fri, 21 Apr 2023 11:49:22 +0530 [thread overview]
Message-ID: <3eca1508-b012-9c9d-d5cf-678ce3dd8665@amd.com> (raw)
In-Reply-To: <20230420192013.733331-1-jsnitsel@redhat.com>
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@8bytes.org>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Thanks for the fix.
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Vasant
next prev parent reply other threads:[~2023-04-21 6:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 19:20 [PATCH] iommu: amd: Fix up merge conflict resolution Jerry Snitselaar
2023-04-21 6:19 ` Vasant Hegde [this message]
2023-05-22 15:24 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3eca1508-b012-9c9d-d5cf-678ce3dd8665@amd.com \
--to=vasant.hegde@amd.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=jsnitsel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox