Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp4056533pxb; Tue, 17 Nov 2020 10:06:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxo7soECQYFb4hS8MtL7Wf1orUzKmmGFQvNytMVY6bvG3telGaij6l9hQr1f2+OEIXwfiDE X-Received: by 2002:adf:ea03:: with SMTP id q3mr724020wrm.141.1605636407338; Tue, 17 Nov 2020 10:06:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605636407; cv=none; d=google.com; s=arc-20160816; b=ET7cykVzb7MIp9/5+eyZOh10ih2EB3y6mIaRuN7OYsF2wFULtEojLvW+EZF/Pq/fB8 4sFJv2Hv2mPHmyCSfaGascARmabQZKjwTO09Rmkjz32AYZ0YyGLVJKIAhxMxZ+1MSQqZ VdkvkuxrFwFkFsOAeh6Yh2sXPFtHfOXrN0R3BwxMq0pe1VwmhiXPTfGdmBPGIwH3+CiE qE+TlIByqli17EXdLpP10//PqavMZ1QwQmFFgxLgI/FgknN+g2HkTfIJYj0yZKTRLk44 y3rtriqmH6TqRDFb9s8DrbAzEKFQ4eh7wTq+W6zY5tFHZ6lzbZfCVze/t3nNeFtRlEna 5cCQ== 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=xVfmVveJyj12/kGyk3umfMmntJGc6PIIBrZEyzy4UMo=; b=NUlHx1Ass5R4bcPBp/Hpp38W3AlfMRPn9MFjxVTLwPuK47elk0M9zUM9LDTO9gDVXg FbYm/gplMmA/ZvtVXRclPrHC24ifh6VXhspaS3FEbm4bSYu8tZRsYvSLTnJ+PdBwrKZQ SN0iYufwGFo55Mg6FhXsWipsEHoXRNefZqTQ2IgdG7llZ2ARbTyl6U6zdSfTHiWAdJuU Gptfpim52hkurlwyPOAnxQ6h5YfJJ5v8RnaN58Dxds1JKbZXOe+MnWhwrul2sJDBfInY rsHbv65dk09+7Ovr+2UMzMRrFCkMgJ4qMgJ1Bd1QR5eyw2HO/ME3xMbt17b53aYIUw/H UXUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cvAFLwZ9; dkim=neutral (no key) header.i=@linutronix.de header.b=u21xZ763; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d8si14539478edn.471.2020.11.17.10.06.22; Tue, 17 Nov 2020 10:06:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=cvAFLwZ9; dkim=neutral (no key) header.i=@linutronix.de header.b=u21xZ763; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730377AbgKQSDN (ORCPT + 99 others); Tue, 17 Nov 2020 13:03:13 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:49776 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730287AbgKQSDM (ORCPT ); Tue, 17 Nov 2020 13:03:12 -0500 Date: Tue, 17 Nov 2020 18:03:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605636190; 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=xVfmVveJyj12/kGyk3umfMmntJGc6PIIBrZEyzy4UMo=; b=cvAFLwZ95h/WSGoIsOV/nrg0IiLK7SElgNW0ungYXt9igmrDhWaFTERdEWM1+5H3WJzIoo yOBaOpJXIsIamCj91lqFCma2kR7KebW9KAIeEOduO7T3rr7bE7qKeb1TIrD70F+DbRaM5r IH9EeobpHdlaKG/DUw9Ii4C/d5nuW3bIw2DSXi/YytY0yiaDL37/r9o/I/BJLfj05jAHB/ OCLI+zD52KfdFbFnADbushT+sGv+0RdDzcigmkN2eIzEwjzmDKZOiDNbtSb2xfAkIvqNyD eVYQpYCob48mzgwaI1MovQ8Zux4JNWvZJp79yblY0MSK4zzyPOa+Yko2vGf0ig== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605636190; 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=xVfmVveJyj12/kGyk3umfMmntJGc6PIIBrZEyzy4UMo=; b=u21xZ763dTvvF6+LsszrkLxjF+/41SIVVsSOu+pIuYWMR5lijEQz5mGBUf0LC1OfQ9WOPd eX2c0c9cxeE6NDBg== From: "tip-bot2 for Geert Uytterhoeven" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: efi/core] efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes Cc: Geert Uytterhoeven , Ard Biesheuvel , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201028153402.1736103-1-geert+renesas@glider.be> References: <20201028153402.1736103-1-geert+renesas@glider.be> MIME-Version: 1.0 Message-ID: <160563618958.11244.17271289662483151013.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the efi/core branch of tip: Commit-ID: 6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a Gitweb: https://git.kernel.org/tip/6edcf9dc2e1aff3aa1f5a69ee420fb30dd0e968a Author: Geert Uytterhoeven AuthorDate: Wed, 28 Oct 2020 16:34:02 +01:00 Committer: Ard Biesheuvel CommitterDate: Thu, 29 Oct 2020 00:36:13 +01:00 efi/libstub: EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER should not default to yes EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER is deprecated, so it should not be enabled by default. In light of commit 4da0b2b7e67524cc ("efi/libstub: Re-enable command line initrd loading for x86"), keep the default for X86. Fixes: cf6b83664895a5c7 ("efi/libstub: Make initrd file loader configurable") Signed-off-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20201028153402.1736103-1-geert+renesas@glider.be Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 36ec1f7..b452cfa 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -122,7 +122,7 @@ config EFI_ARMSTUB_DTB_LOADER config EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER bool "Enable the command line initrd loader" if !X86 depends on EFI_STUB && (EFI_GENERIC_STUB || X86) - default y + default y if X86 depends on !RISCV help Select this config option to add support for the initrd= command