On Tue, Apr 23, 2019 at 07:06:06PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/powerpc/mm/mmu_context_iommu.c
>
> between commits:
>
> eb9d7a62c386 ("powerpc/mm_iommu: Fix potential deadlock")
> 7a3a4d763837 ("
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/mm/mmu_context_iommu.c
between commits:
eb9d7a62c386 ("powerpc/mm_iommu: Fix potential deadlock")
7a3a4d763837 ("powerpc/mm_iommu: Allow pinning large regions")
from the powerpc-fixes tree and commi
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/powerpc/mm/pgtable-book3s64.c
between commit:
579b9239c1f3 ("powerpc/radix: Fix kernel crash with mremap()")
from the powerpc-fixes tree and commit:
41bde21e85a7 ("arch/powerpc/mm: Nest MMU workaround for
