Messages in this thread | | | Date | Fri, 25 Jan 2013 11:49:15 +0100 | From | Ingo Molnar <> | Subject | Re: [git pull] ioapic-cleanups-for-v3.9 |
| |
* Joerg Roedel <joro@8bytes.org> wrote:
> Hi Ingo, > > The following changes since commit 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619: > > Linux 3.8-rc4 (2013-01-17 19:25:45 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/ioapic-cleanups-for-v3.9
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?
Thanks,
Ingo
| |