]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 04:38:22 +0000 (21:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 04:38:22 +0000 (21:38 -0700)
commit687d680985b1438360a9ba470ece8b57cd205c3b
treeae253608531e5c3e823600974c610e722e7de759
parent1053414068bad659479e6efa62a67403b8b1ec0a
parent008fe148cb0fb51d266baabe2c09997b21cf90c6
Merge git://git.infradead.org/~dwmw2/iommu-2.6.31

* git://git.infradead.org/~dwmw2/iommu-2.6.31:
  intel-iommu: Fix one last ia64 build problem in Pass Through Support
  VT-d: support the device IOTLB
  VT-d: cleanup iommu_flush_iotlb_psi and flush_unmaps
  VT-d: add device IOTLB invalidation support
  VT-d: parse ATSR in DMA Remapping Reporting Structure
  PCI: handle Virtual Function ATS enabling
  PCI: support the ATS capability
  intel-iommu: dmar_set_interrupt return error value
  intel-iommu: Tidy up iommu->gcmd handling
  intel-iommu: Fix tiny theoretical race in write-buffer flush.
  intel-iommu: Clean up handling of "caching mode" vs. IOTLB flushing.
  intel-iommu: Clean up handling of "caching mode" vs. context flushing.
  VT-d: fix invalid domain id for KVM context flush
  Fix !CONFIG_DMAR build failure introduced by Intel IOMMU Pass Through Support
  Intel IOMMU Pass Through Support

Fix up trivial conflicts in drivers/pci/{intel-iommu.c,intr_remapping.c}
Documentation/kernel-parameters.txt
arch/ia64/kernel/pci-dma.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/pci-swiotlb.c
drivers/pci/intel-iommu.c
drivers/pci/intr_remapping.c
drivers/pci/iov.c
include/linux/dmar.h
include/linux/pci.h
include/linux/pci_regs.h