linux-next: manual merge of the fs-next tree with the mm-hotfixes tree

[Mark Brown]

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: signature.asc
Description: PGP signature