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

[Tom Lendacky]

On 8/21/2017 10:50 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got conflicts in:
> 
>    drivers/iommu/amd_iommu.c
>    drivers/iommu/amd_iommu_init.c
>    drivers/iommu/amd_iommu_proto.h
>    drivers/iommu/amd_iommu_types.h
> 
> between commits:
> 
>    4c232a708be1 ("iommu/amd: Detect pre enabled translation")
>    9494ea90a56d ("Revert "iommu/amd: Suppress IO_PAGE_FAULTs in kdump kernel"")
>    07a80a6b5920 ("iommu/amd: Define bit fields for DTE particularly")
>    daae2d25a477 ("iommu/amd: Don't copy GCR3 table root pointer")
> 
> from the iommu tree and commit:
> 
>    2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Sorry, I was out of the office the past few days.  I checked the
linux-next tree and everything looks good in relation to commit

  2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption")

Thanks,
Tom