summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-06 14:22:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-06 14:22:58 -0700
commita2de4bbddce3e98bd2444bb027dc84418a0066b1 (patch)
tree4252b3c6f3efeaccc418a543dfa7e5be305c1b2d /Documentation
parent38182162b50aa4e970e5997df0a0c4288147a153 (diff)
parentcc35518d29bc8e38902866b74874b4a3f1ad3617 (diff)
downloadlinux-a2de4bbddce3e98bd2444bb027dc84418a0066b1.tar.bz2
Merge tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio
Pull more VFIO updates from Alex Williamson: "A second small set of commits for this merge window, primarily to unbreak some deletions from our uAPI header. - Additional mdev sample driver cleanup (Dan Carpenter) - Doc fix (Alyssa Ross) - Unbreak uAPI from NVLink2 support removal (Alex Williamson)" * tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio: docs: vfio: fix typo vfio/pci: Revert nvlink removal uAPI breakage vfio/mdev: remove unnecessary NULL check in mbochs_create()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/driver-api/vfio.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/driver-api/vfio.rst b/Documentation/driver-api/vfio.rst
index decc68cb8114..606eed8823ce 100644
--- a/Documentation/driver-api/vfio.rst
+++ b/Documentation/driver-api/vfio.rst
@@ -2,7 +2,7 @@
VFIO - "Virtual Function I/O" [1]_
==================================
-Many modern system now provide DMA and interrupt remapping facilities
+Many modern systems now provide DMA and interrupt remapping facilities
to help ensure I/O devices behave within the boundaries they've been
allotted. This includes x86 hardware with AMD-Vi and Intel VT-d,
POWER systems with Partitionable Endpoints (PEs) and embedded PowerPC