Skip to content

Commit 0854dc8

Browse files
committed
Merge tag 'docs-5.17-2' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "Three small documentation fixes" * tag 'docs-5.17-2' of git://git.lwn.net/linux: Documentation: fix firewire.rst ABI file path error docs: ftrace: fix ambiguous sentence docs: staging/tee.rst: fix two typos found while reading
2 parents 9b57f45 + b0ac702 commit 0854dc8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Documentation/driver-api/firewire.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ of kernel interfaces is available via exported symbols in `firewire-core` module
1919
Firewire char device data structures
2020
====================================
2121

22-
.. include:: /ABI/stable/firewire-cdev
22+
.. include:: ../ABI/stable/firewire-cdev
2323
:literal:
2424

2525
.. kernel-doc:: include/uapi/linux/firewire-cdev.h
@@ -28,7 +28,7 @@ Firewire char device data structures
2828
Firewire device probing and sysfs interfaces
2929
============================================
3030

31-
.. include:: /ABI/stable/sysfs-bus-firewire
31+
.. include:: ../ABI/stable/sysfs-bus-firewire
3232
:literal:
3333

3434
.. kernel-doc:: drivers/firewire/core-device.c

Documentation/staging/tee.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ The following picture shows a high level overview of AMD-TEE::
255255
+--------------------------+ +---------+--------------------+
256256

257257
At the lowest level (in x86), the AMD Secure Processor (ASP) driver uses the
258-
CPU to PSP mailbox regsister to submit commands to the PSP. The format of the
258+
CPU to PSP mailbox register to submit commands to the PSP. The format of the
259259
command buffer is opaque to the ASP driver. It's role is to submit commands to
260260
the secure processor and return results to AMD-TEE driver. The interface
261261
between AMD-TEE driver and AMD Secure Processor driver can be found in [6].
@@ -290,7 +290,7 @@ cancel_req driver callback is not supported by AMD-TEE.
290290

291291
The GlobalPlatform TEE Client API [5] can be used by the user space (client) to
292292
talk to AMD's TEE. AMD's TEE provides a secure environment for loading, opening
293-
a session, invoking commands and clossing session with TA.
293+
a session, invoking commands and closing session with TA.
294294

295295
References
296296
==========

Documentation/trace/ftrace.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3370,7 +3370,7 @@ one of the latency tracers, you will get the following results.
33703370

33713371
Instances
33723372
---------
3373-
In the tracefs tracing directory is a directory called "instances".
3373+
In the tracefs tracing directory, there is a directory called "instances".
33743374
This directory can have new directories created inside of it using
33753375
mkdir, and removing directories with rmdir. The directory created
33763376
with mkdir in this directory will already contain files and other

0 commit comments

Comments
 (0)