From: Joerg Roedel Subject: Re: [git pull] ioapic-cleanups-for-v3.9 Date: Fri, 25 Jan 2013 12:31:05 +0100 Message-ID: <20130125113105.GV25591@8bytes.org> References: <20130125100040.GA13908@8bytes.org> <20130125104915.GB23332@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20130125104915.GB23332-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Ingo Molnar Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Andrzej Siewior , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: iommu@lists.linux-foundation.org On Fri, Jan 25, 2013 at 11:49:15AM +0100, Ingo Molnar wrote: > Hm, there are some not so trivial looking conflicts in > io_apic.c, due to the MSI patches I applied yesterday: > > 5ca72c4f7c41 AHCI: Support multiple MSIs > 08261d87f7d1 PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto() > 51906e779f2b x86/MSI: Support multiple MSIs in presense of IRQ remapping > > Could you please resolve them and resend? Will do. I rebase to tip/x86/apic and test again. Joerg