* linux-next: duplicate patch in the regulator tree
@ 2025-02-19 2:43 Stephen Rothwell
2025-02-23 8:27 ` Shawn Guo
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2025-02-19 2:43 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Shawn Guo
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
Hi all,
The following commit is also in the imx-mxs tree as a different commit
(but the same patch):
b5ec74c2aec7 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
This is commit
38db2315c465 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
in the imx-mxs tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2025-02-19 2:43 linux-next: duplicate patch in the regulator tree Stephen Rothwell
@ 2025-02-23 8:27 ` Shawn Guo
2025-02-24 16:01 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2025-02-23 8:27 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Rothwell, Liam Girdwood, Shawn Guo,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Mark,
On Wed, Feb 19, 2025 at 01:43:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the imx-mxs tree as a different commit
> (but the same patch):
>
> b5ec74c2aec7 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
Any particular reason you picked this DTS change? Would you drop it
from regulator tree?
Shawn
>
> This is commit
>
> 38db2315c465 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
>
> in the imx-mxs tree.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2025-02-23 8:27 ` Shawn Guo
@ 2025-02-24 16:01 ` Mark Brown
2025-02-25 0:37 ` Shawn Guo
0 siblings, 1 reply; 9+ messages in thread
From: Mark Brown @ 2025-02-24 16:01 UTC (permalink / raw)
To: Shawn Guo
Cc: Stephen Rothwell, Liam Girdwood, Shawn Guo,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
On Sun, Feb 23, 2025 at 04:27:55PM +0800, Shawn Guo wrote:
> On Wed, Feb 19, 2025 at 01:43:54PM +1100, Stephen Rothwell wrote:
> > The following commit is also in the imx-mxs tree as a different commit
> > (but the same patch):
> > b5ec74c2aec7 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
> Any particular reason you picked this DTS change? Would you drop it
> from regulator tree?
My understanding was that these fixes all needed to go together since
the interface changes were a bit dodgy from an ABI point of view.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2025-02-24 16:01 ` Mark Brown
@ 2025-02-25 0:37 ` Shawn Guo
2025-02-25 13:37 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2025-02-25 0:37 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Rothwell, Liam Girdwood, Shawn Guo,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Feb 24, 2025 at 04:01:46PM +0000, Mark Brown wrote:
> On Sun, Feb 23, 2025 at 04:27:55PM +0800, Shawn Guo wrote:
> > On Wed, Feb 19, 2025 at 01:43:54PM +1100, Stephen Rothwell wrote:
>
> > > The following commit is also in the imx-mxs tree as a different commit
> > > (but the same patch):
>
> > > b5ec74c2aec7 ("arm64: dts: imx8mp-skov-reva: Use hardware signal for SD card VSELECT")
>
> > Any particular reason you picked this DTS change? Would you drop it
> > from regulator tree?
>
> My understanding was that these fixes all needed to go together since
> the interface changes were a bit dodgy from an ABI point of view.
Let it be with regulator tree. I dropped it from imx tree.
Shawn
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2025-02-25 0:37 ` Shawn Guo
@ 2025-02-25 13:37 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2025-02-25 13:37 UTC (permalink / raw)
To: Shawn Guo
Cc: Stephen Rothwell, Liam Girdwood, Shawn Guo,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
On Tue, Feb 25, 2025 at 08:37:14AM +0800, Shawn Guo wrote:
> On Mon, Feb 24, 2025 at 04:01:46PM +0000, Mark Brown wrote:
> > On Sun, Feb 23, 2025 at 04:27:55PM +0800, Shawn Guo wrote:
> > > Any particular reason you picked this DTS change? Would you drop it
> > > from regulator tree?
> > My understanding was that these fixes all needed to go together since
> > the interface changes were a bit dodgy from an ABI point of view.
> Let it be with regulator tree. I dropped it from imx tree.
OK, great - that's obviously easy for me!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: duplicate patch in the regulator tree
@ 2024-07-01 5:42 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2024-07-01 5:42 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Matthias Brugger,
AngeloGioacchino Del Regno
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
Hi all,
The following commit is also in the mediatek tree as a different commit
(but the same patch):
b147ae7ae514 ("regulator: Add bindings for MediaTek DVFSRC Regulators")
This is commit
9a682c18ee49 ("regulator: Add bindings for MediaTek DVFSRC Regulators")
in the mediatek tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* linux-next: duplicate patch in the regulator tree
@ 2023-06-07 6:37 Stephen Rothwell
2023-06-07 11:29 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2023-06-07 6:37 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Lee Jones
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
Hi all,
The following commit is also in the mfd tree as a different commit
(but the same patch):
75c8cb2f4cb2 ("mfd: axp20x: Add support for AXP313a PMIC")
This is commit
2f518d914bd3 ("mfd: axp20x: Add support for AXP313a PMIC")
in the mfd tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2023-06-07 6:37 Stephen Rothwell
@ 2023-06-07 11:29 ` Mark Brown
2023-06-08 12:42 ` Lee Jones
0 siblings, 1 reply; 9+ messages in thread
From: Mark Brown @ 2023-06-07 11:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, Lee Jones, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
On Wed, Jun 07, 2023 at 04:37:43PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the mfd tree as a different commit
> (but the same patch):
>
> 75c8cb2f4cb2 ("mfd: axp20x: Add support for AXP313a PMIC")
>
> This is commit
>
> 2f518d914bd3 ("mfd: axp20x: Add support for AXP313a PMIC")
>
> in the mfd tree.
Hrm, that was a tag I pulled from Lee rather than something I applied -
not sure what's going on there.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: duplicate patch in the regulator tree
2023-06-07 11:29 ` Mark Brown
@ 2023-06-08 12:42 ` Lee Jones
0 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2023-06-08 12:42 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Rothwell, Liam Girdwood, Linux Kernel Mailing List,
Linux Next Mailing List
On Wed, 07 Jun 2023, Mark Brown wrote:
> On Wed, Jun 07, 2023 at 04:37:43PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commit is also in the mfd tree as a different commit
> > (but the same patch):
> >
> > 75c8cb2f4cb2 ("mfd: axp20x: Add support for AXP313a PMIC")
> >
> > This is commit
> >
> > 2f518d914bd3 ("mfd: axp20x: Add support for AXP313a PMIC")
> >
> > in the mfd tree.
>
> Hrm, that was a tag I pulled from Lee rather than something I applied -
> not sure what's going on there.
Mea culpa. I hadn't rebased onto my own tag.
Should be fixed in the next -next cut.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-02-25 13:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-19 2:43 linux-next: duplicate patch in the regulator tree Stephen Rothwell
2025-02-23 8:27 ` Shawn Guo
2025-02-24 16:01 ` Mark Brown
2025-02-25 0:37 ` Shawn Guo
2025-02-25 13:37 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2024-07-01 5:42 Stephen Rothwell
2023-06-07 6:37 Stephen Rothwell
2023-06-07 11:29 ` Mark Brown
2023-06-08 12:42 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox