From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vlastimil Babka <vbabka@suse•cz>
Subject: linux-next: manual merge of the rcu tree with the jc_docs tree
Date: Mon, 18 Dec 2023 14:25:37 +1100 [thread overview]
Message-ID: <20231218142537.3b74c770@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2132 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
Documentation/admin-guide/kernel-parameters.txt
between commit:
a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter")
from the jc_docs tree and commit:
801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/admin-guide/kernel-parameters.txt
index 33859d298907,b8f131977682..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1,15 -1,4 +1,15 @@@
+ accept_memory= [MM]
+ Format: { eager | lazy }
+ default: lazy
+ By default, unaccepted memory is accepted lazily to
+ avoid prolonged boot times. The lazy option will add
+ some runtime overhead until all memory is eventually
+ accepted. In most cases the overhead is negligible.
+ For some workloads or for debugging purposes
+ accept_memory=eager can be used to accept all memory
+ at once during boot.
+
- acpi= [HW,ACPI,X86,ARM64,RISCV64]
+ acpi= [HW,ACPI,X86,ARM64,RISCV64,EARLY]
Advanced Configuration and Power Interface
Format: { force | on | off | strict | noirq | rsdt |
copy_dsdt }
@@@ -2449,9 -2440,9 +2451,9 @@@
between unregistering the boot console and initializing
the real console.
- keepinitrd [HW,ARM]
+ keepinitrd [HW,ARM] See retain_initrd.
- kernelcore= [KNL,X86,IA-64,PPC]
+ kernelcore= [KNL,X86,IA-64,PPC,EARLY]
Format: nn[KMGTPE] | nn% | "mirror"
This parameter specifies the amount of memory usable by
the kernel for non-movable allocations. The requested
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-12-18 3:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-18 3:25 Stephen Rothwell [this message]
2024-01-02 9:39 ` linux-next: manual merge of the rcu tree with the jc_docs tree Vlastimil Babka
-- strict thread matches above, loose matches on Subject: below --
2022-09-23 3:48 Stephen Rothwell
2022-09-26 17:50 ` Paul E. McKenney
2020-09-02 4:31 Stephen Rothwell
2020-09-03 17:02 ` Paul E. McKenney
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=20231218142537.3b74c770@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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