Subject: Re: linux-next: manual merge of the iommu tree with the arm-soc tree

From: Krzysztof Kozlowski <[email-masked]>
Date: Mon, 18 May 2026 17:17:07 +0200

On 18/05/2026 15:06, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the iommu tree got a conflict in:
> 
>   arch/arm64/configs/defconfig
> 
> between commit:
> 
>   f54f7979ff88d ("arm64: defconfig: Move entries to match savedefconfig")
> 
> from the arm-soc tree and commit:
> 
>   187029b922d0e ("arm64: defconfig: enable Verisilicon IOMMU for Rockchip RK3588")

This patch should rather not be taken by iommu tree.

Just like DTS this is patch for SoC platform. Joerg, could you drop it?
It's better if SoC platform maintainer handles the conflicts.

Best regards,
Krzysztof