Re: [git pull] IOMMU Updates for Linux v4.2

2015-06-24 Thread Joerg Roedel
On Tue, Jun 23, 2015 at 06:47:15PM -0700, Linus Torvalds wrote: > Hmm. My resolution doesn't look the same at all, but that could easily > be due to trivial differences. I tried to make as much sense of the > merge as possible, so I think my merge is fine, but it's also entirely > possible I screwe

Re: [git pull] IOMMU Updates for Linux v4.2

2015-06-23 Thread Linus Torvalds
On Tue, Jun 23, 2015 at 2:24 AM, Joerg Roedel wrote: > > I attached my resolution of the conflicts to this pull-request and > compiled and run-time tested my resolution on an Intel VT-d and an > AMD IOMMU machine. Hmm. My resolution doesn't look the same at all, but that could easily be due to tr

[git pull] IOMMU Updates for Linux v4.2

2015-06-23 Thread Joerg Roedel
Hi Linus, The IOMMU changes have conflicts this time with IRQ related patches coming from the tip tree. Some of the IRQ patches there also touch the Intel and AMD interrupt remapping code in drivers/iommu, which conflicts with the Intel VT-d kdump fixes. I attached my resolution of the conflicts