Subject: Re: linux-next: manual merge of the watchdog tree with the samsung-krzk tree

From: Krzysztof Kozlowski <[email-masked]>
Date: Thu, 7 Nov 2024 10:34:07 +0100

On 07/11/2024 06:59, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the watchdog tree got a conflict in:
> 
>   arch/arm64/boot/dts/exynos/exynosautov920.dtsi
> 
> between commit:
> 
>   ef1c2a54cbc7 ("arm64: dts: exynosautov920: add peric1, misc and hsi0/1 clock DT nodes")
> 
> from the samsung-krzk tree and commit:
> 
>   3595a523d043 ("arm64: dts: exynosautov920: add watchdog DT node")

The main problem is above patch should have never been taken to watchdog
tree. I never agreed on that. I never acked it. It is against SoC
policies which are always requesting entire DTS to go through SoC tree.

Please drop the patch from watchdog. Or revert it.

Best regards,
Krzysztof