diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-07-21 00:05:03 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-21 00:52:55 +0200 |
commit | 59be3baa8dff271d48500e009622318badfc7140 (patch) | |
tree | d7fde1af4197df9ece8ca26fb492051df2ef80f1 /Documentation/riscv/hwprobe.rst | |
parent | tcp: add TCP_OLD_SEQUENCE drop reason (diff) | |
parent | Merge tag 'net-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
download | linux-59be3baa8dff271d48500e009622318badfc7140.tar.xz linux-59be3baa8dff271d48500e009622318badfc7140.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/riscv/hwprobe.rst')
-rw-r--r-- | Documentation/riscv/hwprobe.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst index 19165ebd82ba..933c715065d6 100644 --- a/Documentation/riscv/hwprobe.rst +++ b/Documentation/riscv/hwprobe.rst @@ -49,7 +49,7 @@ The following keys are defined: privileged ISA, with the following known exceptions (more exceptions may be added, but only if it can be demonstrated that the user ABI is not broken): - * The :fence.i: instruction cannot be directly executed by userspace + * The ``fence.i`` instruction cannot be directly executed by userspace programs (it may still be executed in userspace via a kernel-controlled mechanism such as the vDSO). |