From: Wim Van Sebroeck <wim@linux-watchdog•org>
To: Krzysztof Kozlowski <krzk@kernel•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Wim Van Sebroeck <wim@iguana•be>,
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 11:37:08 +0100 [thread overview]
Message-ID: <20241107103708.GB4818@www.linux-watchdog.org> (raw)
In-Reply-To: <a0e3d45f-d982-4961-9945-3c81c0380806@kernel.org>
Hi Krzysztof,
> 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
>
See my other e-mail. Since the 3 patches were about adding a new watchdog driver, I indeed took them in.
This was reverted and I can only presume that you will take the 3 patches and do the necessary via the SoC tree.
Kind regards,
Wim.
next prev parent reply other threads:[~2024-11-07 11:04 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
2024-11-07 10:37 ` Wim Van Sebroeck [this message]
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=20241107103708.GB4818@www.linux-watchdog.org \
--to=wim@linux-watchdog$(echo .)org \
--cc=bt.cho@samsung$(echo .)com \
--cc=krzk@kernel$(echo .)org \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sunyeal.hong@samsung$(echo .)com \
--cc=trunixs.kim@samsung$(echo .)com \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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