Merge tag 'xfs-6.7-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

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

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 01c7082..65731b0 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2227,7 +2227,7 @@
                          forcing Dual Address Cycle for PCI cards supporting
                          greater than 32-bit addressing.
 
-       iommu.strict=   [ARM64, X86] Configure TLB invalidation behaviour
+       iommu.strict=   [ARM64, X86, S390] Configure TLB invalidation behaviour
                        Format: { "0" | "1" }
                        0 - Lazy mode.
                          Request that DMA unmap operations use deferred
@@ -3333,6 +3333,11 @@
 
        mga=            [HW,DRM]
 
+       microcode.force_minrev= [X86]
+                       Format: <bool>
+                       Enable or disable the microcode minimal revision
+                       enforcement for the runtime microcode loader.
+
        min_addr=nn[KMG]        [KNL,BOOT,IA-64] All physical memory below this
                        physical address is ignored.
 
@@ -3591,6 +3596,13 @@
                        [NFS] set the TCP port on which the NFSv4 callback
                        channel should listen.
 
+       nfs.delay_retrans=
+                       [NFS] specifies the number of times the NFSv4 client
+                       retries the request before returning an EAGAIN error,
+                       after a reply of NFS4ERR_DELAY from the server.
+                       Only applies if the softerr mount option is enabled,
+                       and the specified value is >= 0.
+
        nfs.enable_ino64=
                        [NFS] enable 64-bit inode numbers.
                        If zero, the NFS client will fake up a 32-bit inode
@@ -5682,9 +5694,10 @@
        s390_iommu=     [HW,S390]
                        Set s390 IOTLB flushing mode
                strict
-                       With strict flushing every unmap operation will result in
-                       an IOTLB flush. Default is lazy flushing before reuse,
-                       which is faster.
+                       With strict flushing every unmap operation will result
+                       in an IOTLB flush. Default is lazy flushing before
+                       reuse, which is faster. Deprecated, equivalent to
+                       iommu.strict=1.
 
        s390_iommu_aperture=    [KNL,S390]
                        Specifies the size of the per device DMA address space