Re: linux-next: manual merge of the tip tree with the iommu tree

Joerg Roedel
2015-06-05T08:57:40Z

Hi Michael,

On Fri, Jun 05, 2015 at 06:50:30PM +1000, Michael Ellerman wrote:
> diff --cc include/linux/intel-iommu.h
> index a81ceeeaa3d1,0af9b03e2b1c..000000000000
> --- a/include/linux/intel-iommu.h
> +++ b/include/linux/intel-iommu.h
> @@@ -355,9 -349,8 +357,11 @@@ struct intel_iommu
>
> #ifdef CONFIG_IRQ_REMAP
> struct ir_table *ir_table; /* Interrupt remapping info */
> + struct irq_domain *ir_domain;
> + struct irq_domain *ir_msi_domain;
> +
> + /* whether interrupt remapping is enabled prior to OS*/
> + u8 pre_enabled_ir;
> #endif
> struct device *iommu_dev; /* IOMMU-sysfs device */
> int node;

This solution looks correct, thanks for fixing.

Joerg