linux-next: duplicate patch in the mfd tree

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

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

  dd77f5fa97d3 ("mfd: Remove toshiba tmio drivers")

This is commit

  e9b016cfd62d ("mfd: remove toshiba tmio drivers")

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, 27 Jan 2023, Stephen Rothwell wrote:

> Hi all,
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   dd77f5fa97d3 ("mfd: Remove toshiba tmio drivers")
> 
> This is commit
> 
>   e9b016cfd62d ("mfd: remove toshiba tmio drivers")
> 
> in the arm-soc tree.

This one too please.

-- 
Lee Jones [李琼斯]

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):

  c79f9e7253bb ("mfd: Remove toshiba tmio drivers")

This is commit

  8971bb812e3c ("mfd: remove toshiba tmio drivers")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

The following commit is also in the net-next tree as different commit
(but the same patch):

  d6e3854f720f ("dt-bindings: mfd: syscon: Add compatibles for Loongson-1 syscon")

This is commit

  7e10088bc4e4 ("dt-bindings: mfd: syscon: Add compatibles for Loongson-1 syscon")

in the net-next tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

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

  555fa39ba1fd ("dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC")

This is commit

  761cab667898 ("dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC")

in the sound-asoc 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 Thu, 05 Sep 2024, Stephen Rothwell wrote:

> Hi all,
> 
> The following commit is also in the sound-asoc tree as a different commit
> (but the same patch):
> 
>   555fa39ba1fd ("dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC")
> 
> This is commit
> 
>   761cab667898 ("dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC")
> 
> in the sound-asoc tree.

Looks like Mark accidentally applied it here:

https://lore.kernel.org/all/172544860860.19172.7052813450885034844.b4-ty@kernel.org/

-- 
Lee Jones [李琼斯]

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

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

  7f3e3e7228bb ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")

This is commit

  19a634195c1a ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")

in the rockchip 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

[Heiko Stübner]

Hi Stephen, Lee,

Am Montag, 17. März 2025, 04:45:07 MEZ schrieb Stephen Rothwell:
> Hi all,
> 
> The following commit is also in the rockchip tree as a different commit
> (but the same patch):
> 
>   7f3e3e7228bb ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")
> 
> This is commit
> 
>   19a634195c1a ("dt-bindings: mfd: syscon: Add rk3528 QoS register compatible")
> 
> in the rockchip tree.

dang, sorry about that.

With the qos compatible being a syscon, this _should_ go through the mfd
tree with Lee's Signed-off-by ... that it got in 7f3e3e7228bb .

I'm not sure how I managed to mess that up :-S .

In any case, as the commit 19a634195c1a already made its way from my tree
to the soc-tree [0], I'll create a revert so that this is fixed before the
merge-window.


Sorry for the mess and thanks for noticing
Heiko


[0] https://web.git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/commit/?h=for-next&id=19a634195c1a

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

linux-next: duplicate patch in the mfd tree

[Stephen Rothwell]

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

Hi all,

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

  30ed024fb076 ("mfd: bcm2835-pm: Add support for BCM2712")

This is commit

  060d111e8a56 ("mfd: bcm2835-pm: Add support for BCM2712")

in the pmdolain 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, 14 Nov 2025, Stephen Rothwell wrote:

> Hi all,
> 
> The following commit is also in the pmdomain tree as a different commit
> (but the same patch):
> 
>   30ed024fb076 ("mfd: bcm2835-pm: Add support for BCM2712")
> 
> This is commit
> 
>   060d111e8a56 ("mfd: bcm2835-pm: Add support for BCM2712")
> 
> in the pmdolain tree.

Why is this in the pmdomain tree, Ulf?

-- 
Lee Jones [李琼斯]

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

[Ulf Hansson]

On Tue, 18 Nov 2025 at 19:33, Lee Jones <lee@kernel.org> wrote:
>
> On Fri, 14 Nov 2025, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > The following commit is also in the pmdomain tree as a different commit
> > (but the same patch):
> >
> >   30ed024fb076 ("mfd: bcm2835-pm: Add support for BCM2712")
> >
> > This is commit
> >
> >   060d111e8a56 ("mfd: bcm2835-pm: Add support for BCM2712")
> >
> > in the pmdolain tree.
>
> Why is this in the pmdomain tree, Ulf?

The corresponding dt doc patch is in my tree too, so to keep them
together, but also because Florian acked/suggested it to me [1].

I can rebase and drop it from my tree, if you prefer to take it via
your tree? The DT doc patch is however on an immutable branch just
named "dt", so you need to pull that in that case. Please let me know
and sorry for the mess!

Br
Uffe

[1]
https://lore.kernel.org/all/CAPDyKFowo7+-C4YLLw4XoWz4fU3ykEP1UVEEneCJXBuDjGTStw@mail.gmail.com/

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

[Lee Jones]

On Wed, 19 Nov 2025, Ulf Hansson wrote:

> On Tue, 18 Nov 2025 at 19:33, Lee Jones <lee@kernel.org> wrote:
> >
> > On Fri, 14 Nov 2025, Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > The following commit is also in the pmdomain tree as a different commit
> > > (but the same patch):
> > >
> > >   30ed024fb076 ("mfd: bcm2835-pm: Add support for BCM2712")
> > >
> > > This is commit
> > >
> > >   060d111e8a56 ("mfd: bcm2835-pm: Add support for BCM2712")
> > >
> > > in the pmdolain tree.
> >
> > Why is this in the pmdomain tree, Ulf?
> 
> The corresponding dt doc patch is in my tree too, so to keep them
> together, but also because Florian acked/suggested it to me [1].

Neither of you should be deciding the fate of MFD patches.  :)

> I can rebase and drop it from my tree, if you prefer to take it via
> your tree? The DT doc patch is however on an immutable branch just
> named "dt", so you need to pull that in that case. Please let me know
> and sorry for the mess!

Yes, if you can drop the MFD commit, it would solve some issues.

Thanks buddy.  Hope that you're well.

-- 
Lee Jones [李琼斯]

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

[Ulf Hansson]

On Wed, 19 Nov 2025 at 14:01, Lee Jones <lee@kernel.org> wrote:
>
> On Wed, 19 Nov 2025, Ulf Hansson wrote:
>
> > On Tue, 18 Nov 2025 at 19:33, Lee Jones <lee@kernel.org> wrote:
> > >
> > > On Fri, 14 Nov 2025, Stephen Rothwell wrote:
> > >
> > > > Hi all,
> > > >
> > > > The following commit is also in the pmdomain tree as a different commit
> > > > (but the same patch):
> > > >
> > > >   30ed024fb076 ("mfd: bcm2835-pm: Add support for BCM2712")
> > > >
> > > > This is commit
> > > >
> > > >   060d111e8a56 ("mfd: bcm2835-pm: Add support for BCM2712")
> > > >
> > > > in the pmdolain tree.
> > >
> > > Why is this in the pmdomain tree, Ulf?
> >
> > The corresponding dt doc patch is in my tree too, so to keep them
> > together, but also because Florian acked/suggested it to me [1].
>
> Neither of you should be deciding the fate of MFD patches.  :)

Sorry, I got carried away. :-)

>
> > I can rebase and drop it from my tree, if you prefer to take it via
> > your tree? The DT doc patch is however on an immutable branch just
> > named "dt", so you need to pull that in that case. Please let me know
> > and sorry for the mess!
>
> Yes, if you can drop the MFD commit, it would solve some issues.

Done!

>
> Thanks buddy.  Hope that you're well.

Np, old friend! I hope you are well too!

Kind regards
Uffe