From: Mark Brown <broonie@kernel•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Askar Safin <safinaskar@gmail•com>,
Christian Brauner <brauner@kernel•org>, Li Chen <me@linux•beauty>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the fs-next tree with the mm-hotfixes tree
Date: Mon, 2 Feb 2026 13:37:28 +0000 [thread overview]
Message-ID: <aYComD0uH0J9jQu5@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
Documentation/admin-guide/kernel-parameters.txt
between commit:
204cbd056d724 ("Documentation: document liveupdate cmdline parameter")
from the mm-hotfixes tree and commit:
7f3b33668595e ("init: remove deprecated "load_ramdisk" and "prompt_ramdisk" command line parameters")
from the fs-next 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.
diff --cc Documentation/admin-guide/kernel-parameters.txt
index d1b7676e6de27,05b0041dabc12..0000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -3472,13 -3472,6 +3472,11 @@@ Kernel parameter
If there are multiple matching configurations changing
the same attribute, the last one is used.
+ liveupdate= [KNL,EARLY]
+ Format: <bool>
+ Enable Live Update Orchestrator (LUO).
+ Default: off.
+
- load_ramdisk= [RAM] [Deprecated]
-
lockd.nlm_grace_period=P [NFS] Assign grace period.
Format: <integer>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-02-02 13:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aYComD0uH0J9jQu5@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=me@linux$(echo .)beauty \
--cc=safinaskar@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox