Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp1277518rwr; Thu, 20 Apr 2023 12:29:16 -0700 (PDT) X-Google-Smtp-Source: AKy350YfnosIOwpFn0ZTFAky5YDkPxW+yCM5pJKeAdP2lUL5JCo8QU4Sx1eHHbWaIgsBfvW3Z9/I X-Received: by 2002:a05:6a20:9148:b0:d9:ab8b:9f48 with SMTP id x8-20020a056a20914800b000d9ab8b9f48mr3620708pzc.20.1682018955693; Thu, 20 Apr 2023 12:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682018955; cv=none; d=google.com; s=arc-20160816; b=dbxRcPp/q4CiPm/la8oEmuF8syLwDdeuqiRCMiiseWpsBhXDHSdCx/WnHTJ+aoEq68 I8IxzjGggwc9udxoX2IQfpyHcpPWQngxt546sXGSG1Gt06dTLTTCXxJBqMHH4rYjwP1d CO1dSGc98PmQX2U8vgN61HWh55a7o9ue+6yWIvfIVQD8GQgScVBfToEkxwCHk38I+av5 ZlCTjJ4rX+Aw9AAr8RyPOgrqkH82vJyc0tFCX1FzPhkg1hCtXbUfpFBXsxlNMyzVwPWq RX9TKX97Qpk3sDEwEf/x9bHwXAfeXCeWQvBh1dr6isjtI3OuLr5YWCCiTsBaQmb2V8kR hzOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=NFDxpoy2DcBE5wK3y+F/p+EUL+YVKW5BxO5v43iU+ZQ=; b=ca3xAsUxqkicIzYZ8SeX77uFieLv6pPobfKG7BX+vX1EnTOuvPfC9aVjjw86LGgIun HeaHrOEFegqVp9reuUFk36MhLdirT6P/XPn0uuH3OOevzAFomvmTq6wdVl5aaZwvcdjD UvweEt9GbAT5U86AnJCB01HiDhXUBEJWRtGDuIKWp8acc7RVWUWWRjfWEwXggc+MX+2F UdhyLrYcVU+uToiw/5ECilRKY0R3/bgLuscLNAUjPzumIGbEyENVE5vsnvF2/NSq7RfU ILUCoqKX0qw9SCeG5sqP4LAuPRFa9Wx4RVTqZ+MxBeOyvHH3vgjrbUFCJsvhH76M0oxS iPrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bPsJPQGY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o5-20020a17090ac70500b0024b5a028e7asi965625pjt.47.2023.04.20.12.29.02; Thu, 20 Apr 2023 12:29:15 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bPsJPQGY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230002AbjDTTVI (ORCPT + 99 others); Thu, 20 Apr 2023 15:21:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbjDTTVF (ORCPT ); Thu, 20 Apr 2023 15:21:05 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3A0E2717 for ; Thu, 20 Apr 2023 12:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682018420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NFDxpoy2DcBE5wK3y+F/p+EUL+YVKW5BxO5v43iU+ZQ=; b=bPsJPQGY1ZuqNuzVrgNf956mymdMKKgLrBNS2fYrpKmJ9uv7lqMNs9k9xzeNyMgk03vc5L /P3fTJXEMe/p/swE6wJnrlAPHClNzBWJ/ueMYf2WG4XWN//rZ1sjjcFM+ToYUT6VhwzlFu 6qDFT5Oy5udn87+e4GpE4xmHrcHvoew= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-vtxokf2dPLKiumP7Y_Wsyg-1; Thu, 20 Apr 2023 15:20:16 -0400 X-MC-Unique: vtxokf2dPLKiumP7Y_Wsyg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B24BB3C025B0; Thu, 20 Apr 2023 19:20:15 +0000 (UTC) Received: from cantor.redhat.com (unknown [10.2.16.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAEA82166B33; Thu, 20 Apr 2023 19:20:14 +0000 (UTC) From: Jerry Snitselaar To: linux-kernel@vger.kernel.org, iommu@lists.linux.dev Cc: Joerg Roedel , Suravee Suthikulpanit , Will Deacon , Robin Murphy Subject: [PATCH] iommu: amd: Fix up merge conflict resolution Date: Thu, 20 Apr 2023 12:20:13 -0700 Message-Id: <20230420192013.733331-1-jsnitsel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Suravee Suthikulpanit Cc: Will Deacon Cc: Robin Murphy Signed-off-by: Jerry Snitselaar --- drivers/iommu/amd/amd_iommu.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index c160a332ce33..ec139f540c08 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -15,9 +15,6 @@ extern irqreturn_t amd_iommu_int_thread(int irq, void *data); extern irqreturn_t amd_iommu_int_handler(int irq, void *data); extern void amd_iommu_apply_erratum_63(struct amd_iommu *iommu, u16 devid); extern void amd_iommu_restart_event_logging(struct amd_iommu *iommu); -extern int amd_iommu_init_devices(void); -extern void amd_iommu_uninit_devices(void); -extern void amd_iommu_init_notifier(void); extern void amd_iommu_set_rlookup_table(struct amd_iommu *iommu, u16 devid); #ifdef CONFIG_AMD_IOMMU_DEBUGFS -- 2.38.1