Received-SPF: pass (google.com: domain of linux-kernel+bounces-2967-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 18 Dec 2023 14:25:37 +1100
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
Message-ID: <20231218142537.3b74c770@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=tx.bSTmqmFJghJvb9Kx2Al";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/=tx.bSTmqmFJghJvb9Kx2Al
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 kerne=
l 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.

--=20
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=3D  [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=3Deager can be used to accept all memory
 +			at once during boot.
 +
- 	acpi=3D		[HW,ACPI,X86,ARM64,RISCV64]
+ 	acpi=3D		[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.
 =20
 -	keepinitrd	[HW,ARM]
 +	keepinitrd	[HW,ARM] See retain_initrd.
 =20
- 	kernelcore=3D	[KNL,X86,IA-64,PPC]
+ 	kernelcore=3D	[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

--Sig_/=tx.bSTmqmFJghJvb9Kx2Al
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/u7EACgkQAVBC80lX
0GwBkwf/QLoReSVnXc/lAGz8KS+ERdxML4dVE20YnwQw1SmaUC1Vc6+rQhLkuOE4
rJd6Gc7aV9M6QOZuo/08JACwpPi2XpvJDNxbSwCKZxjfw6exkEMuUXW2VKWvx55H
avDvZhUIZ4nCxTx4UzOFXVxF6mI9f51VliSFMmTfOzTavEaO/JoeBX1pOtasj4O8
wJANi5Ku61oXWoJjHj/r20gnPw1WoAZzS1RxWcMWgPvt4m9tk7sU9GyBlmj82r+c
yBhgyG4/Yzo7xkdYJvudIB6wCWVn3hyOTlmliK6Smok0SkvcQsZz+9vT6AgWC1Hk
ySNAF27vRWWO8vpv6La/2Rb/WeEp8A==
=i5Lj
-----END PGP SIGNATURE-----

--Sig_/=tx.bSTmqmFJghJvb9Kx2Al--