* linux-next: duplicate patch in the clk tree
@ 2024-09-03 1:27 Stephen Rothwell
2024-09-03 7:12 ` Geert Uytterhoeven
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2024-09-03 1:27 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd, Geert Uytterhoeven
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 renesas tree as a different commit
(but the same patch):
042859e80d4b ("dt-bindings: clock: renesas: Document RZ/V2H(P) SoC CPG")
This is commit
afec1aba0860 ("dt-bindings: clock: renesas: Document RZ/V2H(P) SoC CPG")
in the renesas tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the clk tree
2024-09-03 1:27 linux-next: duplicate patch in the clk tree Stephen Rothwell
@ 2024-09-03 7:12 ` Geert Uytterhoeven
0 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2024-09-03 7:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mike Turquette, Stephen Boyd, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Stephen,
On Tue, Sep 3, 2024 at 3:27 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> The following commit is also in the renesas tree as a different commit
> (but the same patch):
>
> 042859e80d4b ("dt-bindings: clock: renesas: Document RZ/V2H(P) SoC CPG")
>
> This is commit
>
> afec1aba0860 ("dt-bindings: clock: renesas: Document RZ/V2H(P) SoC CPG")
>
> in the renesas tree.
Thanks, I am aware of this issue. Due to an oversight on my side
when queuing the RZ/V2H clock driver one month ago, I forgot to put
the RZ/V2H DT binding definitions on its own branch. As these binding
definitions are needed for the DTS part, too, I had the choice between
merging in lots of unrelated clock commits, or just duplicating the
aforementioned commit. Hence I picked the latter.
Sorry for the troubles.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: duplicate patch in the clk tree
@ 2024-09-12 0:53 Stephen Rothwell
2024-09-12 0:55 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2024-09-12 0:53 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
Hi all,
The following commit is also in the arm-soc tree as a different commit
(but the same patch):
706ae6446494 ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
This is commit
f579278d690c ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the clk tree
2024-09-12 0:53 Stephen Rothwell
@ 2024-09-12 0:55 ` Stephen Rothwell
2024-09-12 12:14 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2024-09-12 0:55 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Olof Johansson, Arnd Bergmann, ARM
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
Hi all,
[just cc'ing the arm-soc contacts]
On Thu, 12 Sep 2024 10:53:49 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 706ae6446494 ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>
> This is commit
>
> f579278d690c ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>
> in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the clk tree
2024-09-12 0:55 ` Stephen Rothwell
@ 2024-09-12 12:14 ` Arnd Bergmann
2024-09-12 12:31 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2024-09-12 12:14 UTC (permalink / raw)
To: Stephen Rothwell, Michael Turquette, Stephen Boyd
Cc: Linux Kernel Mailing List, linux-next, Olof Johansson, ARM
On Thu, Sep 12, 2024, at 00:55, Stephen Rothwell wrote:
> Hi all,
>
> [just cc'ing the arm-soc contacts]
>
> On Thu, 12 Sep 2024 10:53:49 +1000 Stephen Rothwell
> <sfr@canb•auug.org.au> wrote:
>>
>> Hi all,
>>
>> The following commit is also in the arm-soc tree as a different commit
>> (but the same patch):
>>
>> 706ae6446494 ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>>
>> This is commit
>>
>> f579278d690c ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>>
>> in the arm-soc tree.
Right, this unfortunately has to stay in the soc tree as a dependency
of the ep93xx driver.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the clk tree
2024-09-12 12:14 ` Arnd Bergmann
@ 2024-09-12 12:31 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2024-09-12 12:31 UTC (permalink / raw)
To: Stephen Rothwell, Michael Turquette, Stephen Boyd
Cc: Linux Kernel Mailing List, linux-next, Olof Johansson, ARM
On Thu, Sep 12, 2024, at 12:14, Arnd Bergmann wrote:
> On Thu, Sep 12, 2024, at 00:55, Stephen Rothwell wrote:
>> Hi all,
>>
>> [just cc'ing the arm-soc contacts]
>>
>> On Thu, 12 Sep 2024 10:53:49 +1000 Stephen Rothwell
>> <sfr@canb•auug.org.au> wrote:
>>>
>>> Hi all,
>>>
>>> The following commit is also in the arm-soc tree as a different commit
>>> (but the same patch):
>>>
>>> 706ae6446494 ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>>>
>>> This is commit
>>>
>>> f579278d690c ("clk: fixed-rate: add devm_clk_hw_register_fixed_rate_parent_data()")
>>>
>>> in the arm-soc tree.
>
> Right, this unfortunately has to stay in the soc tree as a dependency
> of the ep93xx driver.
I figured out now that this was originally merged into
my tree as a shared dependency and I accidentally turned
that into a separate commit. I've fixed it up now, using the
commit from the clk tree.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: duplicate patch in the clk tree
@ 2023-07-20 2:00 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2023-07-20 2:00 UTC (permalink / raw)
To: Mike Turquette, Stephen Boyd
Cc: Andrew Morton, Baoquan He, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
Hi all,
The following commit is also in the mm tree tree as a different commit
(but the same patch):
e7dd44f4f316 ("clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM")
This is commit
a53259d47b6f ("clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM")
in the mm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-12 12:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-03 1:27 linux-next: duplicate patch in the clk tree Stephen Rothwell
2024-09-03 7:12 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2024-09-12 0:53 Stephen Rothwell
2024-09-12 0:55 ` Stephen Rothwell
2024-09-12 12:14 ` Arnd Bergmann
2024-09-12 12:31 ` Arnd Bergmann
2023-07-20 2:00 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox