Skip to content

Commit

Permalink
Merge tag 'docs-5.17-2' of git://git.lwn.net/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Jan 22, 2022
2 parents 9b57f45 + b0ac702 commit 0854dc8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Documentation/driver-api/firewire.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ of kernel interfaces is available via exported symbols in `firewire-core` module
Firewire char device data structures
====================================

.. include:: /ABI/stable/firewire-cdev
.. include:: ../ABI/stable/firewire-cdev
:literal:

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

.. include:: /ABI/stable/sysfs-bus-firewire
.. include:: ../ABI/stable/sysfs-bus-firewire
:literal:

.. kernel-doc:: drivers/firewire/core-device.c
Expand Down
4 changes: 2 additions & 2 deletions Documentation/staging/tee.rst
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ The following picture shows a high level overview of AMD-TEE::
+--------------------------+ +---------+--------------------+

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

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

References
==========
Expand Down
2 changes: 1 addition & 1 deletion Documentation/trace/ftrace.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3370,7 +3370,7 @@ one of the latency tracers, you will get the following results.

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

0 comments on commit 0854dc8

Please sign in to comment.