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.
--
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).
+ hibernate.compressor= [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=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
+ highmem=nn[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.
Hi Stephen,
On Monday, February 26, 2024 3:57:45 AM CET Stephen Rothwell wrote:
> 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.
The conflict resolution looks good to me, thank you!
On Mon, Feb 26, 2024 at 01:57:45PM +1100, Stephen Rothwell wrote:
> 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.
>
Thanks! The below looks good to me ;-)
Regards,
Boqun
> --
> 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).
>
> + hibernate.compressor= [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=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
> + highmem=nn[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.