linux-next: duplicate patch in the mfd tree

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

Hi all,

The following commit is also in the arm-soc tree as a different commit
(but the same patch):

  0ffcf5f1e41c ("dt-bindings: mfd: qcom,tcsr: Add compatible for ipq5018")

This is commit

  1d2c5d5f3f44 ("dt-bindings: mfd: qcom,tcsr: Add compatible for ipq5018")

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 mfd tree

[Lee Jones]

On Mon, 26 May 2025, Stephen Rothwell wrote:

> Hi all,
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   0ffcf5f1e41c ("dt-bindings: mfd: qcom,tcsr: Add compatible for ipq5018")
> 
> This is commit
> 
>   1d2c5d5f3f44 ("dt-bindings: mfd: qcom,tcsr: Add compatible for ipq5018")
> 
> in the arm-soc tree.

Why is this patch in the arm-soc tree?

-- 
Lee Jones [李琼斯]

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Hi all,

The following commit is also in the arm-soc tree as a different commit
(but the same patch):

  ba9ae011e837 ("soc: apple: rtkit: Make shmem_destroy optional")

This is commit

  0445eee835d6 ("soc: apple: rtkit: Make shmem_destroy optional")

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 mfd tree

[Lee Jones]

On Fri, 25 Jul 2025, Stephen Rothwell wrote:

> Hi all,
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   ba9ae011e837 ("soc: apple: rtkit: Make shmem_destroy optional")
> 
> This is commit
> 
>   0445eee835d6 ("soc: apple: rtkit: Make shmem_destroy optional")

Odd.  I don't see an applied email for this.

This was applied to MFD and a pull-request was provided for the other subsystems:

https://lore.kernel.org/all/20250724102529.GA11056@google.com/

-- 
Lee Jones [李琼斯]

Re: linux-next: duplicate patch in the mfd tree

[Arnd Bergmann]

On Fri, Jul 25, 2025, at 13:35, Lee Jones wrote:
> On Fri, 25 Jul 2025, Stephen Rothwell wrote:
>
>> The following commit is also in the arm-soc tree as a different commit
>> (but the same patch):
>> 
>>   ba9ae011e837 ("soc: apple: rtkit: Make shmem_destroy optional")
>> 
>> This is commit
>> 
>>   0445eee835d6 ("soc: apple: rtkit: Make shmem_destroy optional")
>
> Odd.  I don't see an applied email for this.
>
> This was applied to MFD and a pull-request was provided for the other 
> subsystems:
>
> https://lore.kernel.org/all/20250724102529.GA11056@google.com/

This is the one I pulled in

https://lore.kernel.org/all/20250722163258.62424-1-sven@kernel.org/

I did not see anything from Sven about a shared commit. I can
throw it out again without too much trouble if you already have
the contents. The only other commit in that branch is 
65293c3276de ("soc: apple: Drop default ARCH_APPLE in Kconfig"),
which I'm sure can wait as it only changes the default.

     Arnd

Re: linux-next: duplicate patch in the mfd tree

[Sven Peter]

On Fri, Jul 25, 2025, at 13:48, Arnd Bergmann wrote:
> On Fri, Jul 25, 2025, at 13:35, Lee Jones wrote:
>> On Fri, 25 Jul 2025, Stephen Rothwell wrote:
>>
>>> The following commit is also in the arm-soc tree as a different commit
>>> (but the same patch):
>>> 
>>>   ba9ae011e837 ("soc: apple: rtkit: Make shmem_destroy optional")
>>> 
>>> This is commit
>>> 
>>>   0445eee835d6 ("soc: apple: rtkit: Make shmem_destroy optional")
>>
>> Odd.  I don't see an applied email for this.

I mentioned I was going to apply it in
https://lore.kernel.org/asahi/a67fcfc9-e708-47db-8605-e20a8b54b0d1@kernel.org/
and also sent out
https://lore.kernel.org/asahi/175292958117.11653.12996215497191655678.b4-ty@kernel.org/
via b4 ty a few days ago. You should've been CCed, no idea why the
email didn't reach your inbox :(

>>
>> This was applied to MFD and a pull-request was provided for the other 
>> subsystems:
>>
>> https://lore.kernel.org/all/20250724102529.GA11056@google.com/
>
> This is the one I pulled in
>
> https://lore.kernel.org/all/20250722163258.62424-1-sven@kernel.org/
>
> I did not see anything from Sven about a shared commit. I can
> throw it out again without too much trouble if you already have
> the contents. The only other commit in that branch is 
> 65293c3276de ("soc: apple: Drop default ARCH_APPLE in Kconfig"),
> which I'm sure can wait as it only changes the default.

Yeah, feel free to just drop that entire PR.
I'll just include that commit in the ones I'll send next cycle.


Sven