Received-SPF: pass (google.com: domain of linux-kernel+bounces-80434-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 26 Feb 2024 13:57:45 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>, "Rafael J. Wysocki"
 <rjw@rjwysocki.net>
Cc: Boqun Feng <boqun.feng@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Nikhil V <quic_nprakash@quicinc.com>
Subject: linux-next: manual merge of the rcu tree with the pm tree
Message-ID: <20240226135745.12ac854d@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4gv1_Pr=DbHejtL+I7uOn.=";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/4gv1_Pr=DbHejtL+I7uOn.=
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:

  3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm")

from the pm tree and commit:

  600716592a3a ("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 c503770e8f0b,3f894fbb4916..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1753,18 -1749,7 +1754,18 @@@
  				(that will set all pages holding image data
  				during restoration read-only).
 =20
 +	hibernate.compressor=3D 	[HIBERNATION] Compression algorithm to be
 +				used with hibernation.
 +				Format: { lzo | lz4 }
 +				Default: lzo
 +
 +				lzo: Select LZO compression algorithm to
 +				compress/decompress hibernation image.
 +
 +				lz4: Select LZ4 compression algorithm to
 +				compress/decompress hibernation image.
 +
- 	highmem=3Dnn[KMG]	[KNL,BOOT] forces the highmem zone to have an exact
+ 	highmem=3Dnn[KMG]	[KNL,BOOT,EARLY] forces the highmem zone to have an ex=
act
  			size of <nn>. This works even on boxes that have no
  			highmem otherwise. This also works to reduce highmem
  			size on bigger boxes.

--Sig_/4gv1_Pr=DbHejtL+I7uOn.=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXb/ikACgkQAVBC80lX
0GwQWAf7B+7G0prf44SGgzsLu+Bb6kk3pV+R6mR573pVFBIZnBuySykCFvucCeGR
hbBpdNKOQA6wG9C7Dm/HqnYGdJZb0NrxYJyMR/4rH2giAbpROE6Okyy8QmT/C82E
Taf4rXpOiacEIfuy5FhtDN0NF8BbeznMq3MaOc1shWzHbn0VuA5dNrIfJIJE6MSm
5hQ9h+DGnGI2jzvAJTxNqXMXbw/VUPfYLUFxOTOlcdTu20x7uziIqPXjf2V9j+Md
z6lnRjwxPwNz5tybZQ81eMvG6xVauEWjMTOF8d5LSrj01PnVwuvLcAkmHTYiMG8W
MuEnHX7vKIvAtqRNg18v7tSV5c5CVA==
=fcfT
-----END PGP SIGNATURE-----

--Sig_/4gv1_Pr=DbHejtL+I7uOn.=--