From patchwork Wed Oct 11 08:30:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 151198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp383655vqb; Wed, 11 Oct 2023 01:30:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzXm8Xf5y25usLjpHFz5yJ6WJENyzU8hPu6yKQNvDq7bVG2KrT/GMjHP9MRfeIFjXIwM4o X-Received: by 2002:a17:902:e74b:b0:1c7:1eed:10f2 with SMTP id p11-20020a170902e74b00b001c71eed10f2mr23237775plf.2.1697013046274; Wed, 11 Oct 2023 01:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697013046; cv=none; d=google.com; s=arc-20160816; b=ZB9y/8p2uQX+V2StswfWRTQ16jORLdwFQwG0a4oV31Hu0V0JKRbBmXTUSp/b7zl0tH wk8c/E4oVnMq2MisjN2Ib5cXilr53ns0fkuWi2sotSnyw5USrmVt7Pf6IrHWXeW01UPM TbXLcaRIoCS67T+gnA58Pp407ssXh1wg9Hg5TD2i+/uLQ/Da2PnfWEs0fUW2jRwTFOYl WlHCwkkMZTdqTCeU0qNmX096z4WVwKAk4HxNuOOsQ1H1BXFAsLRo9O2tr5y0rzqAPsiS 99mMxXfJeuVyNZhvurT9Q2UwkiRRF4g1IHz1AclOtvlxHXoMYpcLJWgSp7qJbIuHNeL/ TRzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=/9fhabdFY85OZWqZt36fI3rnF5gFBzXAgjbPAo/WTLM=; fh=HqNl6IGLVbyrglu/3wem66k4E42ZmpURttqztWZmOPs=; b=a53ih1b8HXGiZjSYBmcbXWXhtx6Z5mwwvUlJH9QXDygmQIUtptzeSyx1Dnpr5vGpbb Lvp7rd5tUN5kIIoys9GUEagEPZ3Zf3XXLFSDY4JZ9jFMhvx9GLwZwTKpBw3wQZ6EijE+ 1ndsm+rCMpkFrHP9lVptjiJVcq/wrc5LE0JikMeXM3eAyzyUxJw+oN3wX5ONQSjebA8v kTktm+nJzXEZO0LR4EiYHRscE81SaVOGxr6Q8S76/MIEGEE0xCG/8Pg8Ir5LOMpDGwU6 zE9JBcgSbbvJuXlkub/GLKzJnxKGC8z4b5LmUA1NGtF6o8ktYbAEg9npQCLuaRa4R1gx PvCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jzp0imOY; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e1-20020a17090301c100b001c89c86160bsi9791647plh.385.2023.10.11.01.30.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 01:30:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=jzp0imOY; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9F0D280A4173; Wed, 11 Oct 2023 01:30:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345379AbjJKIaR (ORCPT + 19 others); Wed, 11 Oct 2023 04:30:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbjJKIaP (ORCPT ); Wed, 11 Oct 2023 04:30:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2FBA9D; Wed, 11 Oct 2023 01:30:12 -0700 (PDT) Date: Wed, 11 Oct 2023 08:30:10 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697013011; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/9fhabdFY85OZWqZt36fI3rnF5gFBzXAgjbPAo/WTLM=; b=jzp0imOYfNfeWxvYhTtCD56JkT5w2zQHjJ7Ww8WGaca1lHqztGLQuO4xUHUXrcOkJmC302 TBHAh4YY/SXRMOhpTT9tOfilvN+yRFXhitZSpOdMjNdxf+OBuG8IxqEPmwWVAF5Y+Tu8/h KM9jgkMFHkwAKGFJgMl03QvzAuZ64ix1mTXFYIlkwpCQwK6TBam1HMewFBT0ta3vF0PYUL 6xp5ijFBXiOaNASvCMdoNTV6csWi4bFW3XBPLWXTdpgYCw37kmhrPkgS3Cf845rFoAb1l9 aYLXOUJlvgIT+5fqLZBf5cyvhoFRTD5nFHBHAzVBdL1/wPhF3JCm6ZUiUYLwrA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697013011; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/9fhabdFY85OZWqZt36fI3rnF5gFBzXAgjbPAo/WTLM=; b=udflPfjgJDtp+fREDqRUFLcQuqoQVXeOMDemMQSA12pM4Mq4MuJQj+B4Xyqhz30cKHZYbH Uk5kVsfVxF7OHiBg== From: "tip-bot2 for Alexander Shishkin" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/sev: Drop unneeded #include Cc: Alexander Shishkin , Ingo Molnar , Tom Lendacky , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231010145220.3960055-3-alexander.shishkin@linux.intel.com> References: <20231010145220.3960055-3-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Message-ID: <169701301076.3135.13127013166356652434.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 11 Oct 2023 01:30:43 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779447151616654589 X-GMAIL-MSGID: 1779447151616654589 The following commit has been merged into the x86/mm branch of tip: Commit-ID: d6f274b7c8ac52abc81e898b62c3ff63fbeb11b8 Gitweb: https://git.kernel.org/tip/d6f274b7c8ac52abc81e898b62c3ff63fbeb11b8 Author: Alexander Shishkin AuthorDate: Tue, 10 Oct 2023 17:52:20 +03:00 Committer: Ingo Molnar CommitterDate: Wed, 11 Oct 2023 10:15:47 +02:00 x86/sev: Drop unneeded #include Commit: 20f07a044a76 ("x86/sev: Move common memory encryption code to mem_encrypt.c") ... forgot to remove the include of virtio_config.h from mem_encrypt_amd.c when it moved the related code to mem_encrypt.c (from where this include subsequently got removed by a later commit). Remove it now. Signed-off-by: Alexander Shishkin Signed-off-by: Ingo Molnar Reviewed-by: Tom Lendacky Link: https://lore.kernel.org/r/20231010145220.3960055-3-alexander.shishkin@linux.intel.com --- arch/x86/mm/mem_encrypt_amd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index 62dde75..a68f2dd 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include