linux-kernel - linux-next: manual merge of the rcu tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231218142537.3b74c770@canb.auug.org.au>
Date: Mon, 18 Dec 2023 14:25:37 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Paul E. McKenney" <paulmck@...nel.org>, Jonathan Corbet
 <corbet@....net>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Vlastimil Babka <vbabka@...e.cz>
Subject: linux-next: manual merge of the rcu tree with the jc_docs tree

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

Content of type "application/pgp-signature" skipped