Merge branch 'core/iommu' into auto-latest

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/iommu/dmar.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/iommu/intr_remapping.c
index 73a903491f2cb28c55f332e3ec5544e16e93d49f,cfb0dd4bf0b6ca43497cc73a355d5e5fac981cdd..07c9f189f3143250e5ea2d0ea20fcdaa2b1674df
--- 1/drivers/iommu/intr_remapping.c
--- 2/drivers/iommu/intr_remapping.c
+++ b/drivers/iommu/intr_remapping.c
@@@ -498,9 -507,18 +507,18 @@@ static void iommu_disable_intr_remappin
                      readl, !(sts & DMA_GSTS_IRES), sts);
  
  end:
 -      spin_unlock_irqrestore(&iommu->register_lock, flags);
 +      raw_spin_unlock_irqrestore(&iommu->register_lock, flags);
  }
  
+ static int __init dmar_x2apic_optout(void)
+ {
+       struct acpi_table_dmar *dmar;
+       dmar = (struct acpi_table_dmar *)dmar_tbl;
+       if (!dmar || no_x2apic_optout)
+               return 0;
+       return dmar->flags & DMAR_X2APIC_OPT_OUT;
+ }
+ 
  int __init intr_remapping_supported(void)
  {
        struct dmar_drhd_unit *drhd;

diff --cc include/linux/intel-iommu.h
Simple merge