Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3eca1508-b012-9c9d-d5cf-678ce3dd8665@amd.com>
Date:   Fri, 21 Apr 2023 11:49:22 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: [PATCH] iommu: amd: Fix up merge conflict resolution
Content-Language: en-US
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>
References: <20230420192013.733331-1-jsnitsel@redhat.com>
From:   Vasant Hegde <vasant.hegde@amd.com>
In-Reply-To: <20230420192013.733331-1-jsnitsel@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c1A2OG55bE54R0d1WTN0aUxMNWJiK0JsUmlZcXJuOXFqbHhQOGREM2E0czNP?=
 =?utf-8?B?eStjckZwUEtTWGFod20wVll3S1pxenRYUHE4QzhrSGg0NURtZjEvcE1jS3NG?=
 =?utf-8?B?V1JFZHdYemZTYU93VnlMOGllZWIwRWIrNHl0MmJlWExKbDQ5Wm9WTHR3VkE1?=
 =?utf-8?B?Q1BuY0NDZFNTUjBOMjVHSTdiUjhoNUdCeGxqQTZ1N1RlcEoxVmVtMGs0M1pt?=
 =?utf-8?B?WWpqZG5mSmdpQWFzTlJYaW5MWGpSeVNmTk1vY2NTV3BtNWZHVzR5UWVNY044?=
 =?utf-8?B?T3lUbUplbVk5U0UrYkJwdGpESVNXTVFQVFpUL29KSm41YXA5L0plbVppODdU?=
 =?utf-8?B?cS9saU90bjB4NjVjUmNIUjFkQ3NRZzdOQlgrTThvNEhPS21xN1ZhYmNnMG5X?=
 =?utf-8?B?OWJCWmRxMXJTSGJScng1UGxVcHg2dzFXYlhNRWF3ci9yckVNSmd1bzJLU09w?=
 =?utf-8?B?Zm5YSHR1Y2pKY2pTUzFUdVRwMnpCTTk0R3BzYndMeEt4ZTVmenZJdGF2M1U1?=
 =?utf-8?B?K0piR3ptSDFkeUpkYVE5am1Ub0RKclFkdWo4Q09qbVF5S25hWURWVTBFMCs5?=
 =?utf-8?B?NERVcExQOEFkVXQyakZCMm9KRVpsWkpmQjRYdjVRM1JZczVwMHFrdlpDSlht?=
 =?utf-8?B?QloybkQ4V0NHTDcrWDJVZE85ak1NZG1VSnNFNUZQcGJ4QlVxYlJqQzM1VHFs?=
 =?utf-8?B?aTVuMVNIN043MjkwRVhxbndJOEVqOFhDTXkzM2d0a1oxOFdxNXF6YVZzZHdq?=
 =?utf-8?B?WmVLVU4wNDFjTk5kTlNBSTdlMGpTQ2c3UDNxQlFKeWJwQ1crbmIyTDd6WEd3?=
 =?utf-8?B?SUdIYUhhM0w0THhMcDA5ZDFBbVdKZGdtcFZ3WEhUK3dHOWYxQU5uUWZtQ0Z3?=
 =?utf-8?B?OENWV3hjY0NCdXZ5dmV0ZTRFcUxSejN3K0dYSmdxVk9hSW1pREErbm9Rayt5?=
 =?utf-8?B?cjMyL1NNeVJhanBDS1dlZ0tLcTUrK3doeUZ1UnVSTmFiZlMwNmFjRCtMQTl5?=
 =?utf-8?B?S3k3TXFlVXE3Mms2NC8zekE5MmNacThjSUF3Q3VXY0tiVEgxMjNNUGpHelZM?=
 =?utf-8?B?UWh2MGZaSHJWemJ1L1F1S3ZlQm5xQ0NmRUlNeC9PcGxlaHFOOUp2SWliVy9u?=
 =?utf-8?B?QjNKKzc5VldLSy9LU1hUWHhla2xnWGlTbGJzTm9XUmtub3J0NHFOZ29Pdkpz?=
 =?utf-8?B?MW5WZjZnWjkyQTVDaEhUNytzbWJLa2RlbTNjZDd5eUZWSmdMT3JmQ01MaFBw?=
 =?utf-8?B?cU0ySFJqUTJnVTl4SEtIUnB4QTE2Q2RMaHdkNTF6TzZJTXdNWkJVSnN3N2Nl?=
 =?utf-8?B?YTdQVnpZVkQ5V0JzSWJjUm90VVBjUzA0bi9NOXAxUElMSFBTemV1VURlSy9l?=
 =?utf-8?B?b0lTWkJvbzIrc3R1SkhsV0k1RXVGSWlFYmFqYTR4WVpXN2JxdTJEZ0paaUFx?=
 =?utf-8?B?MmRYaHJuVi9EazBSSHBITkJxV3VCNW5McE4zSW1hb0FZdGtNOU1qVmw0cFdM?=
 =?utf-8?B?d1ZENk11d0JKSk0zaVlhY0FrWldRWnZWVzdnZ05TYXBwVzdtV0pUK0daZFBq?=
 =?utf-8?B?MkltSDdLcTErcm53b2lqZHBONXFJaHRhRjBUWVZwMTdiZGM2bStTc0FsUUhD?=
 =?utf-8?B?UjNmcEFXSjN0OGoyNTBhdFE4TEduMU00TEVYbUExcjllZzJHZlhOSUhLb2RH?=
 =?utf-8?B?Tyt6QTQrbkNPR2dES0RBV28vbCtmWm9sYnp4aFhtRkc3enpBWFNBbFZvYmY4?=
 =?utf-8?B?ZlJETmY1dHdwZXg3ZllJRHNmdUd1TlBRb2xQUWpOWjZSQ3FuNkNLVnhiSzIy?=
 =?utf-8?B?V1FiQU5kUjZBeEt1LzR1bmpMdmIzcU52NGtTUlJmejgzcHJqN0FuMXRRQ0lJ?=
 =?utf-8?B?K0ZCQ2dUVUVjYVpDaHJMR1FVVmpIV2haSG1LU3ZlR1c3Z2hKOG5IQkdGdGZY?=
 =?utf-8?B?Rk1DdEFPZy9MamV3TVJJUEVVbC92YU52UU1yQU1ldDNjRVlDUjV4T0dLT3gw?=
 =?utf-8?B?MXFya0ZZbFgwbE8vUmFnelZLUlJkeUVNVWpyclYvQlExaXN3VG50aXQwSGVE?=
 =?utf-8?B?TGRLSG1lMTBQYlcyYVN0L05xY3FMaHRGZTNXSThJYWl2R3RZK0NQWkJqaDI1?=
 =?utf-8?Q?h7Z+RrGkEFnuoz6zPxG6pPTMc?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f21814e5-9b87-4dca-1a7b-08db42306039
X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6043.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2023 06:19:34.6202
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DwTCVHBD+nblgLhyA4+JmyjlVxRFLu+EfR5G5UsIXyKDGcpMoyVy2L0IM9TnMd2dphRZ6H2tQnHTrjEtwaQs6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7987
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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