Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/kernel.h:13:0, from include/linux/interrupt.h:5, from drivers/iommu/intel_irq_remapping.c:4: drivers/iommu/intel_irq_remapping.c: In function 'intel_enable_irq_remapping': drivers/iommu/intel_irq_remapping.c:656:48: error: 'eim' undeclared (first use in this function) pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic"); ^ Caused by my mismerge :-( I added this merge fix patch (and will fix the merge itself tomorrow): From: Stephen Rothwell Date: Tue, 9 Jun 2015 17:12:00 +1000 Subject: [PATCH] iommu.vt-d: fix mismerge Signed-off-by: Stephen Rothwell --- drivers/iommu/intel_irq_remapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 0d2500d17a2f..c19918471b3a 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -653,7 +653,7 @@ static int __init intel_enable_irq_remapping(void) irq_remapping_enabled = 1; - pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic"); + pr_info("Enabled IRQ remapping in %s mode\n", eim_mode ? "x2apic" : "xapic"); return eim_mode ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE; -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au