From: Krzysztof Kozlowski <krzk@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Wim Van Sebroeck <wim@iguana.be>
Cc: Byoungtae Cho <bt.cho@samsung.com>,
Guenter Roeck <linux@roeck-us.net>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sunyeal Hong <sunyeal.hong@samsung.com>,
Taewan Kim <trunixs.kim@samsung.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Subject: Re: linux-next: manual merge of the watchdog tree with the samsung-krzk tree
Date: Thu, 7 Nov 2024 10:34:07 +0100 [thread overview]
Message-ID: <a0e3d45f-d982-4961-9945-3c81c0380806@kernel.org> (raw)
In-Reply-To: <20241107165933.3e8b5af5@canb.auug.org.au>
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
next prev parent reply other threads:[~2024-11-07 9:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 5:59 linux-next: manual merge of the watchdog tree with the samsung-krzk tree Stephen Rothwell
2024-11-07 9:34 ` Krzysztof Kozlowski [this message]
2024-11-07 10:37 ` Wim Van Sebroeck
2024-11-07 14:11 ` Guenter Roeck
2024-11-07 14:25 ` Wim Van Sebroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a0e3d45f-d982-4961-9945-3c81c0380806@kernel.org \
--to=krzk@kernel.org \
--cc=bt.cho@samsung.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sfr@canb.auug.org.au \
--cc=sunyeal.hong@samsung.com \
--cc=trunixs.kim@samsung.com \
--cc=wim@iguana.be \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox