* 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; 3+ 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] 3+ messages in thread
* Re: linux-next: duplicate patch in the regulator tree
2023-06-07 6:37 linux-next: duplicate patch in the regulator tree Stephen Rothwell
@ 2023-06-07 11:29 ` Mark Brown
2023-06-08 12:42 ` Lee Jones
0 siblings, 1 reply; 3+ 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] 3+ 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; 3+ 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] 3+ messages in thread
end of thread, other threads:[~2023-06-08 12:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-07 6:37 linux-next: duplicate patch in the regulator tree 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;
as well as URLs for NNTP newsgroup(s).