Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bbecbd5797a33e9aab2a318f61e15767a365289a..a38d55b6482cd178dbb3cd2f5902eca937ac48ca 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1602,6 +1602,20 @@
                        dependencies. This only applies for fw_devlink=on|rpm.
                        Format: <bool>
 
+       fw_devlink.sync_state =
+                       [KNL] When all devices that could probe have finished
+                       probing, this parameter controls what to do with
+                       devices that haven't yet received their sync_state()
+                       calls.
+                       Format: { strict | timeout }
+                       strict -- Default. Continue waiting on consumers to
+                               probe successfully.
+                       timeout -- Give up waiting on consumers and call
+                               sync_state() on any devices that haven't yet
+                               received their sync_state() calls after
+                               deferred_probe_timeout has expired or by
+                               late_initcall() if !CONFIG_MODULES.
+
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)
@@ -3349,6 +3363,12 @@
                        specified, <module>.async_probe takes precedence for
                        the specific module.
 
+       module.enable_dups_trace
+                       [KNL] When CONFIG_MODULE_DEBUG_AUTOLOAD_DUPS is set,
+                       this means that duplicate request_module() calls will
+                       trigger a WARN_ON() instead of a pr_warn(). Note that
+                       if MODULE_DEBUG_AUTOLOAD_DUPS_TRACE is set, WARN_ON()s
+                       will always be issued and this option does nothing.
        module.sig_enforce
                        [KNL] When CONFIG_MODULE_SIG is set, this means that
                        modules without (valid) signatures will fail to load.
@@ -3992,7 +4012,7 @@
                        [KNL] Minimal page reporting order
                        Format: <integer>
                        Adjust the minimal page reporting order. The page
-                       reporting is disabled when it exceeds (MAX_ORDER-1).
+                       reporting is disabled when it exceeds MAX_ORDER.
 
        panic=          [KNL] Kernel behaviour on panic: delay <timeout>
                        timeout > 0: seconds before rebooting
@@ -6150,15 +6170,6 @@
                        later by a loaded module cannot be set this way.
                        Example: sysctl.vm.swappiness=40
 
-       sysfs.deprecated=0|1 [KNL]
-                       Enable/disable old style sysfs layout for old udev
-                       on older distributions. When this option is enabled
-                       very new udev will not work anymore. When this option
-                       is disabled (or CONFIG_SYSFS_DEPRECATED not compiled)
-                       in older udev will not work anymore.
-                       Default depends on CONFIG_SYSFS_DEPRECATED_V2 set in
-                       the kernel configuration.
-
        sysrq_always_enabled
                        [KNL]
                        Ignore sysrq setting - this boot parameter will