* linux-next: duplicate patch in the samsung-krzk tree
@ 2023-10-17 0:01 Stephen Rothwell
2023-10-17 9:42 ` Uwe Kleine-König
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2023-10-17 0:01 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann
Cc: ARM, Uwe Kleine-König, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
Hi all,
The following commit is also in the arm-soc tree as a different commit
(but the same patch):
0da7c05d232d ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
This is commit
55fa358ca89f ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-10-17 0:01 linux-next: duplicate patch in the samsung-krzk tree Stephen Rothwell
@ 2023-10-17 9:42 ` Uwe Kleine-König
2023-10-17 9:50 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Uwe Kleine-König @ 2023-10-17 9:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann, ARM,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
Hello,
On Tue, Oct 17, 2023 at 11:01:18AM +1100, Stephen Rothwell wrote:
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 0da7c05d232d ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
>
> This is commit
>
> 55fa358ca89f ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
>
> in the arm-soc tree.
a few more details that I worked out for this situation, so (hopefully)
others don't have to duplicate this effort:
The commit in the samsung-krzk tree was applied by Krzysztof at Sep 28
and sent later (Oct 16) as a patch to Arnd (and others) in reply to a PR
(https://lore.kernel.org/all/20231016072911.27148-1-krzysztof.kozlowski@linaro.org/)
and without further explanation.
My guess is that the patch in question wasn't applied to a topic branch
but to Krzysztof's for-next directly and so was missed to be included in
the PR. Or it was on a topic branch but as the only patch on that and so
it was sent out individually. I'd expect that 0da7c05d232d won't make it
into the mainline.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-10-17 9:42 ` Uwe Kleine-König
@ 2023-10-17 9:50 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-10-17 9:50 UTC (permalink / raw)
To: Uwe Kleine-König, Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Linux Kernel Mailing List,
Linux Next Mailing List
On 17/10/2023 11:42, Uwe Kleine-König wrote:
> Hello,
>
> On Tue, Oct 17, 2023 at 11:01:18AM +1100, Stephen Rothwell wrote:
>> The following commit is also in the arm-soc tree as a different commit
>> (but the same patch):
>>
>> 0da7c05d232d ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
>>
>> This is commit
>>
>> 55fa358ca89f ("soc: samsung: exynos-chipid: Convert to platform remove callback returning void")
>>
>> in the arm-soc tree.
>
> a few more details that I worked out for this situation, so (hopefully)
> others don't have to duplicate this effort:
>
> The commit in the samsung-krzk tree was applied by Krzysztof at Sep 28
> and sent later (Oct 16) as a patch to Arnd (and others) in reply to a PR
> (https://lore.kernel.org/all/20231016072911.27148-1-krzysztof.kozlowski@linaro.org/)
> and without further explanation.
>
> My guess is that the patch in question wasn't applied to a topic branch
> but to Krzysztof's for-next directly and so was missed to be included in
> the PR. Or it was on a topic branch but as the only patch on that and so
> it was sent out individually. I'd expect that 0da7c05d232d won't make it
> into the mainline.
The patch was the only one on topic branch, thus I sent it as a patch,
not as a pull request. It standard stuff. I dropped it today to avoid
any confusion, but anyway there would be no risk of this patch appearing
twice in mainline.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: duplicate patch in the samsung-krzk tree
@ 2025-11-24 1:09 Stephen Rothwell
2025-11-24 7:49 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2025-11-24 1:09 UTC (permalink / raw)
To: Krzysztof Kozlowski, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
Hi all,
The following commit is also in the arm-soc tree as a different commit
(but the same patch):
2e646b21df4c ("arm64: defconfig: enable Exynos ACPM clocks")
This is commit
38c8787f1b81 ("arm64: defconfig: enable Exynos ACPM clocks")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2025-11-24 1:09 Stephen Rothwell
@ 2025-11-24 7:49 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2025-11-24 7:49 UTC (permalink / raw)
To: Stephen Rothwell, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
On 24/11/2025 02:09, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 2e646b21df4c ("arm64: defconfig: enable Exynos ACPM clocks")
>
> This is commit
>
> 38c8787f1b81 ("arm64: defconfig: enable Exynos ACPM clocks")
>
> in the arm-soc tree.
Thanks, that's expected. I dropped mine now.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: duplicate patch in the samsung-krzk tree
@ 2024-07-10 2:33 Stephen Rothwell
2024-07-10 6:38 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2024-07-10 2:33 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
Hi all,
The following commit is also in the arm-soc tree as a different commit
(but the same patch):
85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
This is commit
97c4264f62a7 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2024-07-10 2:33 Stephen Rothwell
@ 2024-07-10 6:38 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2024-07-10 6:38 UTC (permalink / raw)
To: Stephen Rothwell, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
On 10/07/2024 04:33, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
>
> This is commit
>
> 97c4264f62a7 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
>
That's expected. I dropped the patch from my tree now, thanks.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: duplicate patch in the samsung-krzk tree
@ 2023-09-29 0:25 Stephen Rothwell
2023-10-03 6:22 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2023-09-29 0:25 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
Hi all,
The following commit is also in the arm-soc-fixes tree as a different
commit (but the same patch):
471eed5ad217 ("arm64: defconfig: enable syscon-poweroff driver")
This is commit
d75e870c32f6 ("arm64: defconfig: enable syscon-poweroff driver")
in the arm-soc-fixes tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-09-29 0:25 Stephen Rothwell
@ 2023-10-03 6:22 ` Krzysztof Kozlowski
2023-10-03 14:31 ` Arnd Bergmann
0 siblings, 1 reply; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-10-03 6:22 UTC (permalink / raw)
To: Stephen Rothwell, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
On 29/09/2023 02:25, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc-fixes tree as a different
> commit (but the same patch):
>
> 471eed5ad217 ("arm64: defconfig: enable syscon-poweroff driver")
>
> This is commit
>
> d75e870c32f6 ("arm64: defconfig: enable syscon-poweroff driver")
>
> in the arm-soc-fixes tree.
Hm, I did not expect this going through arm-soc, but no problem. I
dropped it now from my tree.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-10-03 6:22 ` Krzysztof Kozlowski
@ 2023-10-03 14:31 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2023-10-03 14:31 UTC (permalink / raw)
To: Krzysztof Kozlowski, Stephen Rothwell, Olof Johansson
Cc: ARM, Linux Kernel Mailing List, linux-next
On Tue, Oct 3, 2023, at 08:22, Krzysztof Kozlowski wrote:
> On 29/09/2023 02:25, Stephen Rothwell wrote:
>> Hi all,
>>
>> The following commit is also in the arm-soc-fixes tree as a different
>> commit (but the same patch):
>>
>> 471eed5ad217 ("arm64: defconfig: enable syscon-poweroff driver")
>>
>> This is commit
>>
>> d75e870c32f6 ("arm64: defconfig: enable syscon-poweroff driver")
>>
>> in the arm-soc-fixes tree.
>
> Hm, I did not expect this going through arm-soc, but no problem. I
> dropped it now from my tree.
Right, I was a little confused about why you sent the patch to
soc@kernel•org and had to guess between applying to fixes, to
the next branches or ignoring.
I should have asked you for confirmation here, but ended up
just merging it as it seemed harmless enough either way.
Arnd
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: duplicate patch in the samsung-krzk tree
@ 2023-08-15 2:06 Stephen Rothwell
2023-08-15 4:59 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2023-08-15 2:06 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann
Cc: ARM, Rob Herring, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
Hi all,
The following commit is also in arm-soc tree as a different commit
(but the same patch):
3027df7e739c ("ARM: s5pv210: Explicitly include correct DT includes")
This is commit
8787bc51a7e2 ("ARM: s5pv210: Explicitly include correct DT includes")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-08-15 2:06 Stephen Rothwell
@ 2023-08-15 4:59 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-08-15 4:59 UTC (permalink / raw)
To: Stephen Rothwell, Olof Johansson, Arnd Bergmann
Cc: ARM, Rob Herring, Linux Kernel Mailing List,
Linux Next Mailing List
On 15/08/2023 04:06, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in arm-soc tree as a different commit
> (but the same patch):
>
> 3027df7e739c ("ARM: s5pv210: Explicitly include correct DT includes")
>
> This is commit
>
> 8787bc51a7e2 ("ARM: s5pv210: Explicitly include correct DT includes")
>
> in the arm-soc tree.
Thanks, it was expected.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
* linux-next: duplicate patch in the samsung-krzk tree
@ 2023-06-29 22:46 Stephen Rothwell
2023-07-01 7:57 ` Krzysztof Kozlowski
0 siblings, 1 reply; 14+ messages in thread
From: Stephen Rothwell @ 2023-06-29 22:46 UTC (permalink / raw)
To: Krzysztof Kozlowski; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):
858fd147234d ("arm64: dts: exynos: Remove clock from Exynos850 pmu_system_controller")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: linux-next: duplicate patch in the samsung-krzk tree
2023-06-29 22:46 Stephen Rothwell
@ 2023-07-01 7:57 ` Krzysztof Kozlowski
0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2023-07-01 7:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On 30/06/2023 00:46, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
> 858fd147234d ("arm64: dts: exynos: Remove clock from Exynos850 pmu_system_controller")
Thanks, it is kind of expected and won't make it twice to Linus' tree. I
should have dropped it when it was merged by my upstream maintainer.
Dropped now.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2025-11-24 7:50 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-17 0:01 linux-next: duplicate patch in the samsung-krzk tree Stephen Rothwell
2023-10-17 9:42 ` Uwe Kleine-König
2023-10-17 9:50 ` Krzysztof Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 1:09 Stephen Rothwell
2025-11-24 7:49 ` Krzysztof Kozlowski
2024-07-10 2:33 Stephen Rothwell
2024-07-10 6:38 ` Krzysztof Kozlowski
2023-09-29 0:25 Stephen Rothwell
2023-10-03 6:22 ` Krzysztof Kozlowski
2023-10-03 14:31 ` Arnd Bergmann
2023-08-15 2:06 Stephen Rothwell
2023-08-15 4:59 ` Krzysztof Kozlowski
2023-06-29 22:46 Stephen Rothwell
2023-07-01 7:57 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox