linux-next: duplicate patch in the samsung-krzk tree

linux-next: duplicate patch in the samsung-krzk tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the samsung-krzk tree

[Krzysztof Kozlowski]

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

Re: linux-next: duplicate patch in the samsung-krzk tree

[Krzysztof Kozlowski]

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

Re: linux-next: duplicate patch in the samsung-krzk tree

[Uwe Kleine-König]

[-- 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 --]

linux-next: duplicate patch in the samsung-krzk tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the samsung-krzk tree

[Arnd Bergmann]

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

Re: linux-next: duplicate patch in the samsung-krzk tree

[Krzysztof Kozlowski]

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

linux-next: duplicate patch in the samsung-krzk tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the samsung-krzk tree

[Krzysztof Kozlowski]

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

linux-next: duplicate patch in the samsung-krzk tree

[Stephen Rothwell]

[-- 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 --]