Skip to content
  • Linus Torvalds's avatar
    Merge branch 'core-iommu-for-linus' of... · 6d16d6d9
    Linus Torvalds authored
    Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
      iommu/amd: Don't use MSI address range for DMA addresses
      iommu/amd: Move missing parts to drivers/iommu
      iommu: Move iommu Kconfig entries to submenu
      x86/ia64: intel-iommu: move to drivers/iommu/
      x86: amd_iommu: move to drivers/iommu/
      msm: iommu: move to drivers/iommu/
      drivers: iommu: move to a dedicated folder
      x86/amd-iommu: Store device alias as dev_data pointer
      x86/amd-iommu: Search for existind dev_data before allocting a new one
      x86/amd-iommu: Allow dev_data->alias to be NULL
      x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
      x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
      x86/amd-iommu: Store ATS state in dev_data
      x86/amd-iommu: Store devid in dev_data
      x86/amd-iommu: Introduce global dev_data_list
      x86/amd-iommu: Remove redundant device_flush_dte() calls
      iommu-api: Add missing header file
    
    Fix up trivial conflicts (independent additions close to each other) in
    drivers/Makefile and include/linux/pci.h
    6d16d6d9