Merge tag 'docs-5.7-2' of git://git.lwn.net/linux

[tomoyo/tomoyo-test1.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 86aae1f..2ad7d7c 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -685,7 +685,7 @@
        coredump_filter=
                        [KNL] Change the default value for
                        /proc/<pid>/coredump_filter.
-                       See also Documentation/filesystems/proc.txt.
+                       See also Documentation/filesystems/proc.rst.
 
        coresight_cpu_debug.enable
                        [ARM,ARM64]
@@ -962,7 +962,7 @@
                        edid/1680x1050.bin, or edid/1920x1080.bin is given
                        and no file with the same name exists. Details and
                        instructions how to build your own EDID data are
-                       available in Documentation/driver-api/edid.rst. An EDID
+                       available in Documentation/admin-guide/edid.rst. An EDID
                        data set will only be used for a particular connector,
                        if its name and a colon are prepended to the EDID
                        name. Each connector may use a unique EDID data
@@ -992,10 +992,6 @@
                        Documentation/admin-guide/dynamic-debug-howto.rst
                        for details.
 
-       nompx           [X86] Disables Intel Memory Protection Extensions.
-                       See Documentation/x86/intel_mpx.rst for more
-                       information about the feature.
-
        nopku           [X86] Disable Memory Protection Keys CPU feature found
                        in some Intel CPUs.