Received-SPF: pass (google.com: domain of linux-kernel+bounces-86129-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Feedback-ID: iad51458e:Fastmail
Date: Wed, 28 Feb 2024 20:59:17 -0800
From: Boqun Feng <boqun.feng@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@kernel.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	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: Re: linux-next: manual merge of the rcu tree with the pm tree
Message-ID: <ZeAPJYPfgc6q2tpu@tardis>
References: <20240226135745.12ac854d@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="XJyYbvL4ZSs4ZkVx"
Content-Disposition: inline
In-Reply-To: <20240226135745.12ac854d@canb.auug.org.au>


--XJyYbvL4ZSs4ZkVx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Feb 26, 2024 at 01:57:45PM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the rcu tree got a conflict in:
>=20
>   Documentation/admin-guide/kernel-parameters.txt
>=20
> between commit:
>=20
>   3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm")
>=20
> from the pm tree and commit:
>=20
>   600716592a3a ("doc: Add EARLY flag to early-parsed kernel boot paramete=
rs")
>=20
> from the rcu tree.
>=20
> 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

Thanks! The below looks good to me ;-)

Regards,
Boqun


> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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 =
exact
>   			size of <nn>. This works even on boxes that have no
>   			highmem otherwise. This also works to reduce highmem
>   			size on bigger boxes.


--XJyYbvL4ZSs4ZkVx
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAABCAAdFiEEj5IosQTPz8XU1wRHSXnow7UH+rgFAmXgDx8ACgkQSXnow7UH
+rh7sggApIMmADJfpEBuhu4yI0YxPVeG9zTgQbfWM+QuWH9fr6SnGyqsHumxER8D
kdKD7h8xK3ZzFc4Fl/MjRu+/GrBLDKbH16kayjiCkiOkVVjFbpHw5nlZdFlXL3Ps
h0WzOHY5URZuyXsy/eB4F5QElWNNHoCfQdS+c2JyWMagkRMwVGmhM2ZcyR4crzdK
R93WLv5lJE3xY2auuUqMEqKQUyeg+rsH/dCXv2crDeMTcM4OVbshcD7OBPQka7VM
lxkgDe7h6tp3+FioA5oVvp0YlNmXHMy85Mk2nPg7fJ9lZM4//NS4YJFFG2Gnwil4
dYvQQMIyuqLqtYSowH6GsdK8k++GBw==
=vVL1
-----END PGP SIGNATURE-----

--XJyYbvL4ZSs4ZkVx--