linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Tom Rini" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Tom Rini <trini@konsulko.com>, Borislav Petkov <bp@suse.de>,
	x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cleanups] initrd: Remove erroneous comment
Date: Fri, 19 Jun 2020 17:49:02 -0000	[thread overview]
Message-ID: <159258894258.16989.15930098471806969630.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200619143056.24538-1-trini@konsulko.com>

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     eacb0c101a0bdf14de77cc9d107493e2d8d6389c
Gitweb:        https://git.kernel.org/tip/eacb0c101a0bdf14de77cc9d107493e2d8d6389c
Author:        Tom Rini <trini@konsulko.com>
AuthorDate:    Fri, 19 Jun 2020 10:30:56 -04:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 19 Jun 2020 19:23:54 +02:00

initrd: Remove erroneous comment

Most architectures have been passing the location of an initrd via the
initrd= option since their inception.  Remove the comment as it's both
wrong and unrelated to the commit that introduced it.

For a bit more context, I assume there's been some confusion between
"initrd" being a keyword in things like extlinux.conf and also that for
quite a long time now initrd information is passed via device tree and
not the command line on relevant architectures. But it's still true that
it's been a valid command line option to the kernel since the 90s. It's
just the case that in 2018 the code was consolidated from under arch/
and in to this file.

 [ bp: Move the context clarification up into the commit message proper. ]

Fixes: 694cfd87b0c8 ("x86/setup: Add an initrdmem= option to specify initrd physical address")
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200619143056.24538-1-trini@konsulko.com
---
 init/do_mounts_initrd.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index d72beda..53314d7 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -45,11 +45,6 @@ static int __init early_initrdmem(char *p)
 }
 early_param("initrdmem", early_initrdmem);
 
-/*
- * This is here as the initrd keyword has been in use since 11/2018
- * on ARM, PowerPC, and MIPS.
- * It should not be; it is reserved for bootloaders.
- */
 static int __init early_initrd(char *p)
 {
 	return early_initrdmem(p);

  reply	other threads:[~2020-06-19 17:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-19 14:30 [PATCH] initrd: Remove erroneous comment Tom Rini
2020-06-19 17:49 ` tip-bot2 for Tom Rini [this message]
2020-06-20  0:03 ` ron minnich
2020-06-22 20:23   ` hpa
2020-06-22 20:02 ` ron minnich
2020-06-22 20:40   ` Tom Rini
2020-06-22 20:48     ` H. Peter Anvin
2020-06-22 21:06       ` Tom Rini
2020-06-22 20:56     ` ron minnich
2020-06-22 21:01       ` Tom Rini
2020-06-22 21:03         ` H. Peter Anvin
2020-06-22 21:07           ` Tom Rini

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=159258894258.16989.15930098471806969630.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=trini@konsulko.com \
    --cc=x86@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;
as well as URLs for NNTP newsgroup(s).