aboutsummaryrefslogtreecommitdiff
path: root/Documentation/driver-api/vfio.rst
diff options
context:
space:
mode:
authorGravatar Michael Ellerman <mpe@ellerman.id.au> 2021-05-08 21:12:55 +1000
committerGravatar Michael Ellerman <mpe@ellerman.id.au> 2021-05-08 21:12:55 +1000
commitf96271cefe6dfd1cb04195b76f4a33e185cd7f92 (patch)
treef290b3e7aa9c12fdc4853ce97c150c4f9abd90a3 /Documentation/driver-api/vfio.rst
parentKVM: PPC: Book3S HV: Fix conversion to gfn-based MMU notifier callbacks (diff)
parentMerge tag 'tag-chrome-platform-for-v5.13' of git://git.kernel.org/pub/scm/lin... (diff)
downloadlinux-f96271cefe6dfd1cb04195b76f4a33e185cd7f92.tar.gz
linux-f96271cefe6dfd1cb04195b76f4a33e185cd7f92.tar.bz2
linux-f96271cefe6dfd1cb04195b76f4a33e185cd7f92.zip
Merge branch 'master' into next
Merge master back into next, this allows us to resolve some conflicts in arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so that they are in alphabetical order again.
Diffstat (limited to 'Documentation/driver-api/vfio.rst')
-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