The patch titled
intel iommu: Kconfig fixes
has been added to the -mm tree. Its filename is
intel-iommu-iommu-floppy-workaround-kconfig-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: intel iommu: Kconfig fixes
From: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>
Signed-off-by: Jan Engelhardt <jengelh@xxxxxx>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86_64/Kconfig | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/x86_64/Kconfig~intel-iommu-iommu-floppy-workaround-kconfig-fix arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~intel-iommu-iommu-floppy-workaround-kconfig-fix
+++ a/arch/x86_64/Kconfig
@@ -753,11 +753,11 @@ config DMAR
depends on PCI_MSI && ACPI && EXPERIMENTAL
default y
help
- DMA remapping (DMAR) devices support enables independent address
- translations for Direct Memory Access (DMA) from devices.
+ DMA remapping(DMAR) devices support enables independent address
+ translations for Direct Memory Access(DMA) from Devices.
These DMA remapping devices are reported via ACPI tables
- and include PCI device scope covered by these DMA
- remapping devices.
+ and includes pci device scope covered by these DMA
+ remapping device.
config DMAR_GFX_WA
bool "Support for Graphics workaround"
@@ -765,9 +765,9 @@ config DMAR_GFX_WA
default y
help
Current Graphics drivers tend to use physical address
- for DMA and avoid using DMA APIs. Setting this config
+ for DMA and avoid using DMA api's. Setting this config
option permits the IOMMU driver to set a unity map for
- all the OS-visible memory. Hence the driver can continue
+ all the OS visible memory. Hence the driver can continue
to use physical addresses for DMA.
config DMAR_FLOPPY_WA
_
Patches currently in -mm which might be from jengelh@xxxxxxxxxxxxxxx are
fix-gregkh-usb-usb-use-menuconfig-objects.patch
make-timespec_equal-take-const-arguments.patch
intel-iommu-iommu-gfx-workaround-kconfig-fix.patch
intel-iommu-iommu-floppy-workaround-kconfig-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
