Commit 0854dc81 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 9b57f458 b0ac702f
...@@ -19,7 +19,7 @@ of kernel interfaces is available via exported symbols in `firewire-core` module ...@@ -19,7 +19,7 @@ of kernel interfaces is available via exported symbols in `firewire-core` module
Firewire char device data structures Firewire char device data structures
==================================== ====================================
.. include:: /ABI/stable/firewire-cdev .. include:: ../ABI/stable/firewire-cdev
:literal: :literal:
.. kernel-doc:: include/uapi/linux/firewire-cdev.h .. kernel-doc:: include/uapi/linux/firewire-cdev.h
...@@ -28,7 +28,7 @@ Firewire char device data structures ...@@ -28,7 +28,7 @@ Firewire char device data structures
Firewire device probing and sysfs interfaces Firewire device probing and sysfs interfaces
============================================ ============================================
.. include:: /ABI/stable/sysfs-bus-firewire .. include:: ../ABI/stable/sysfs-bus-firewire
:literal: :literal:
.. kernel-doc:: drivers/firewire/core-device.c .. kernel-doc:: drivers/firewire/core-device.c
......
...@@ -255,7 +255,7 @@ The following picture shows a high level overview of AMD-TEE:: ...@@ -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 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 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 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]. 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. ...@@ -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 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 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 References
========== ==========
......
...@@ -3370,7 +3370,7 @@ one of the latency tracers, you will get the following results. ...@@ -3370,7 +3370,7 @@ one of the latency tracers, you will get the following results.
Instances 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 This directory can have new directories created inside of it using
mkdir, and removing directories with rmdir. The directory created mkdir, and removing directories with rmdir. The directory created
with mkdir in this directory will already contain files and other with mkdir in this directory will already contain files and other
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment