On Tue, Oct 26, 2010 at 01:03:32PM +1100, Stephen Rothwell wrote: > Hi Konrad, > > Today's linux-next merge of the swiotlb-xen tree got a conflict in > arch/x86/include/asm/io_apic.h between commit > 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 ("x86: apic: Move > probe_nr_irqs_gsi() into ioapic_init_mappings()") from the tip tree and > commit 7b586d71858091f0958e5808b7e3d5390c2ae47d ("x86/io_apic: add > get_nr_irqs_gsi()") from the swiotlb-xen tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thank you. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html