On Wed, Aug 21, 2019 at 02:16:40PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/gpu/drm/panfrost/panfrost_mmu.c
>
> between commit:
>
> 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
>
> from
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/gpu/drm/panfrost/panfrost_mmu.c
between commit:
187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
from the drm-misc tree and commit:
a2d3a382d6c6 ("iommu/io-pgtable: Pass struct
