The patch titled
     intel iommu: Kconfig fixes
has been removed from the -mm tree.  Its filename was
     intel-iommu-iommu-floppy-workaround-kconfig-fix.patch

This patch was dropped because it was folded into 
intel-iommu-iommu-floppy-workaround.patch

------------------------------------------------------
Subject: intel iommu: Kconfig fixes
From: Jan Engelhardt <[EMAIL PROTECTED]>

Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
Cc: Anil S Keshavamurthy <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/x86_64/Kconfig |    8 ++++----
 1 file changed, 4 insertions(+), 4 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
@@ -777,10 +777,10 @@ config DMAR_FLOPPY_WA
        depends on DMAR
        default y
        help
-        Floppy disk drivers are know to by pass dma api calls
-        their by failing to work when IOMMU is enabled. This
-        work around will setup a 1 to 1 mappings for the first
-        16M to make floppy(isa device) work.
+        Floppy disk drivers are know to bypass DMA API calls
+        thereby failing to work when IOMMU is enabled. This
+        workaround will setup a 1:1 mapping for the first
+        16M to make floppy (an ISA device) work.
 
 source "drivers/pci/pcie/Kconfig"
 
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
intel-iommu-iommu-gfx-workaround.patch
intel-iommu-iommu-floppy-workaround.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 [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to