linux-next: duplicate patches in the devicetree tree

linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in various other trees as different
commits (but the same patches):

  11844f340318 ("cdx: Explicitly include correct DT includes, again")
  319e31686b9f ("tpm: nuvoton: Use i2c_get_match_data()")
  5adf0863e467 ("serial: esp32_acm: Add explicit platform_device.h include")
  68398c844813 ("serial: esp32_uart: Use device_get_match_data()")
  72cc46a84b80 ("pci: rcar-gen4: Replace of_device.h with explicit of.h include")

These are commits

  aaee477e3e2c ("cdx: Explicitly include correct DT includes, again")

from the char-misc tree

  ebf2d4e8e582 ("tpm: nuvoton: Use i2c_get_match_data()")

from the tpmdd tree

  2600d9939440 ("serial: esp32_acm: Add explicit platform_device.h include")
  3d19ff562d06 ("serial: esp32_uart: Use device_get_match_data()")

from the tty tree

  ec2152374804 ("PCI: rcar-gen4: Replace of_device.h with explicit of.h include")

from the pci tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the devicetree tree

[Rob Herring]

On Sun, Dec 17, 2023 at 11:42 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in various other trees as different
> commits (but the same patches):
>
>   11844f340318 ("cdx: Explicitly include correct DT includes, again")
>   319e31686b9f ("tpm: nuvoton: Use i2c_get_match_data()")
>   5adf0863e467 ("serial: esp32_acm: Add explicit platform_device.h include")
>   68398c844813 ("serial: esp32_uart: Use device_get_match_data()")
>   72cc46a84b80 ("pci: rcar-gen4: Replace of_device.h with explicit of.h include")
>
> These are commits
>
>   aaee477e3e2c ("cdx: Explicitly include correct DT includes, again")
>
> from the char-misc tree
>
>   ebf2d4e8e582 ("tpm: nuvoton: Use i2c_get_match_data()")
>
> from the tpmdd tree
>
>   2600d9939440 ("serial: esp32_acm: Add explicit platform_device.h include")
>   3d19ff562d06 ("serial: esp32_uart: Use device_get_match_data()")
>
> from the tty tree
>
>   ec2152374804 ("PCI: rcar-gen4: Replace of_device.h with explicit of.h include")
>
> from the pci tree.

Yes, expected as I was carrying them until applied. Now dropped.

Rob

linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):

  05f7599c60c9 ("net: can: Use device_get_match_data()")
  396b0c8f30be ("thermal: loongson2: Replace of_device.h with explicit includes")
  d57d584ef69d ("of: Stop circularly including of_device.h and of_platform.h")
  f5cfd90c1ae0 ("sparc: Use device_get_match_data()")

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the pci tree as different commits
(but the same patches):

  15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
  28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
  649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")

These are commits

  d7890a80e037 ("dt-bindings: Drop unnecessary quotes on keys")
  301e978b9eb7 ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
  247edade4b4b ("dt-bindings: PCI: microchip: Increase number of items in ranges property")

in the pci tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the devicetree tree

[Krzysztof Wilczyński]

Hello,

> The following commits are also in the pci tree as different commits
> (but the same patches):
> 
>   15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
>   28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
>   649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")
> 
> These are commits
> 
>   d7890a80e037 ("dt-bindings: Drop unnecessary quotes on keys")
>   301e978b9eb7 ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
>   247edade4b4b ("dt-bindings: PCI: microchip: Increase number of items in ranges property")
> 
> in the pci tree.

I took the last two, and dropped the first one, per feedback from Rob.

	Krzysztof

Re: linux-next: duplicate patches in the devicetree tree

[Rob Herring]

On Wed, May 15, 2024 at 8:50 AM Krzysztof Wilczyński <kw@linux.com> wrote:
>
> Hello,
>
> > The following commits are also in the pci tree as different commits
> > (but the same patches):
> >
> >   15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
> >   28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> >   649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")
> >
> > These are commits
> >
> >   d7890a80e037 ("dt-bindings: Drop unnecessary quotes on keys")
> >   301e978b9eb7 ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> >   247edade4b4b ("dt-bindings: PCI: microchip: Increase number of items in ranges property")
> >
> > in the pci tree.
>
> I took the last two, and dropped the first one, per feedback from Rob.

Normally, that's what should have happened was my feedback. That's not
what we should do here. What you've done means we *both* have to
rebase our branches. Since we're in the merge window and I've had
these commits in my tree for over a week, I think you should drop all
3.

I only picked up the PCI ones because they hadn't been picked up in
over 2 weeks and the merge window was approaching. What's going to
Linus should be in linux-next before the merge window opens. We're all
guilty of bending the rules there, but that should be the exception.

Rob

Re: linux-next: duplicate patches in the devicetree tree

[Krzysztof Wilczyński]

Hello,

> > > The following commits are also in the pci tree as different commits
> > > (but the same patches):
> > >
> > >   15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
> > >   28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> > >   649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")
> > >
> > > These are commits
> > >
> > >   d7890a80e037 ("dt-bindings: Drop unnecessary quotes on keys")
> > >   301e978b9eb7 ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> > >   247edade4b4b ("dt-bindings: PCI: microchip: Increase number of items in ranges property")
> > >
> > > in the pci tree.
> >
> > I took the last two, and dropped the first one, per feedback from Rob.
> 
> Normally, that's what should have happened was my feedback. That's not
> what we should do here. What you've done means we *both* have to
> rebase our branches. Since we're in the merge window and I've had
> these commits in my tree for over a week, I think you should drop all
> 3.

Done.  Thank you!

> I only picked up the PCI ones because they hadn't been picked up in
> over 2 weeks and the merge window was approaching. What's going to
> Linus should be in linux-next before the merge window opens. We're all
> guilty of bending the rules there, but that should be the exception.

I will pay a much closer attention to DT patches from now on, so I can
track things better, and pick things sooner.

	Krzysztof

linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the arm-soc and risc-v trees as
different commits (but the same patches):

  0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
  877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
  c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the devicetree tree

[Rob Herring]

On Tue, Jul 9, 2024 at 12:46 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in the arm-soc and risc-v trees as
> different commits (but the same patches):
>
>   0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
>   877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
>   c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")

I had to rebase my tree yesterday to drop a bunch of reserved-memory
restructuring that seems broken beyond repair. Maybe I'm going to have
to just do reverts instead. I had no knowledge that anyone had pulled
in my tree and how is it just these 3 commits? It should be at least
these:

e83445ff82c3 dt-bindings: interrupt-controller: convert marvell,mpic
binding to YAML
7de99a24a975 dt-bindings: clock: drop obsolete stericsson,abx500.txt
c0ea5d103c5d dt-bindings: riscv: cpus: add ref to interrupt-controller
634c4347b3b4 dt-bindings: interrupt-controller: riscv,cpu-intc:
convert to dtschema
27674d602e7e dt-bindings: arm: cpus: Add new Cortex and Neoverse names
3251b36bf430 dt-bindings: interrupt-controller: qcom,pdc: Add sc8180x PDC
4f42882bb9e4 PCI: of_property: Add interrupt-controller property in
PCI device nodes
58a7a4ac485f of: unittest: Add a test case for of_changeset_add_prop_bool()
de63fa7dc80e of: dynamic: Introduce of_changeset_add_prop_bool()
05c9f943c9d8 of: unittest: Add tests for changeset properties adding
8957c7464362 of: dynamic: Constify parameter in
of_changeset_add_prop_string_array()
a16705e10236 dt-bindings: dma: qcom,gpi: document the SDX75 GPI DMA Engine
8c58884d056d dt-bindings: watchdog: img,pdc-wdt: Convert to dtschema
dab5b8e26e84 dt-bindings: timer: renesas,tmu: Make interrupt-names required
285c645d842c dt-bindings: interrupt-controller: fsl,irqsteer: Add
imx8mp/imx8qxp support

Rob

Re: linux-next: duplicate patches in the devicetree tree

[Arnd Bergmann]

On Tue, Jul 9, 2024, at 14:42, Rob Herring wrote:
> On Tue, Jul 9, 2024 at 12:46 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> The following commits are also in the arm-soc and risc-v trees as
>> different commits (but the same patches):
>>
>>   0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
>>   877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
>>   c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")
>
> I had to rebase my tree yesterday to drop a bunch of reserved-memory
> restructuring that seems broken beyond repair. Maybe I'm going to have
> to just do reverts instead. I had no knowledge that anyone had pulled
> in my tree and how is it just these 3 commits? It should be at least
> these:

I picked up 

b1a4e71d4fc4 arm: dts: arm: Drop redundant fixed-factor clocks
f7e642bcd622 dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
2af8d8a583a4 ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node

from patchwork when they were sent to soc@kernel.org. I don't
see the other ones in the arm-soc tree though, maybe they
are merged elsewhere?

      Arnd

Re: linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

On Tue, 09 Jul 2024 15:15:44 +0200 "Arnd Bergmann" <arnd@arndb.de> wrote:
>
> On Tue, Jul 9, 2024, at 14:42, Rob Herring wrote:
> > On Tue, Jul 9, 2024 at 12:46 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> >>
> >> The following commits are also in the arm-soc and risc-v trees as
> >> different commits (but the same patches):
> >>
> >>   0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
> >>   877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
> >>   c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")  
> >
> > I had to rebase my tree yesterday to drop a bunch of reserved-memory
> > restructuring that seems broken beyond repair. Maybe I'm going to have
> > to just do reverts instead. I had no knowledge that anyone had pulled
> > in my tree and how is it just these 3 commits? It should be at least
> > these:  
> 
> I picked up 
> 
> b1a4e71d4fc4 arm: dts: arm: Drop redundant fixed-factor clocks
> f7e642bcd622 dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
> 2af8d8a583a4 ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node
> 
> from patchwork when they were sent to soc@kernel.org. I don't
> see the other ones in the arm-soc tree though, maybe they
> are merged elsewhere?

Yeah, the risc-v tree.  Sorry about that, I should probably have done 2
notifications.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the devicetree tree

[Rob Herring]

On Tue, Jul 9, 2024 at 7:16 AM Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Tue, Jul 9, 2024, at 14:42, Rob Herring wrote:
> > On Tue, Jul 9, 2024 at 12:46 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Hi all,
> >>
> >> The following commits are also in the arm-soc and risc-v trees as
> >> different commits (but the same patches):
> >>
> >>   0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller")
> >>   877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML")
> >>   c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema")
> >
> > I had to rebase my tree yesterday to drop a bunch of reserved-memory
> > restructuring that seems broken beyond repair. Maybe I'm going to have
> > to just do reverts instead. I had no knowledge that anyone had pulled
> > in my tree and how is it just these 3 commits? It should be at least
> > these:
>
> I picked up
>
> b1a4e71d4fc4 arm: dts: arm: Drop redundant fixed-factor clocks
> f7e642bcd622 dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML
> 2af8d8a583a4 ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node
>
> from patchwork when they were sent to soc@kernel.org. I don't
> see the other ones in the arm-soc tree though, maybe they
> are merged elsewhere?

Looks like it is just these 3 and my rebase was just a coincidence.
The duplicates have been there for some time. The risc-v patches were
applied by both Palmer and me on 6/24, but not pushed out by Palmer
until 6/27.

I guess since I rebased already, I can again and will drop these 3 commits.

Rob

linux-next: duplicate patches in the devicetree tree

[Stephen Rothwell]

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

Hi all,

The following commits are also in the arm-soc tree as different commits
(but the same patches):

  a78f7a337bc7 ("docs: process: maintainer-soc-clean-dts: linux-next is decisive")
  b31cc6af1bb1 ("docs: dt: submitting-patches: Document sending DTS patches")

These are commits

  a42d2d53a6d7 ("docs: process: maintainer-soc-clean-dts: linux-next is decisive")
  d98d35d99e0f ("docs: dt: submitting-patches: Document sending DTS patches")

in the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the devicetree tree

[Arnd Bergmann]

On Fri, Mar 21, 2025, at 05:38, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the arm-soc tree as different commits
> (but the same patches):
>
>   a78f7a337bc7 ("docs: process: maintainer-soc-clean-dts: linux-next is 
> decisive")
>   b31cc6af1bb1 ("docs: dt: submitting-patches: Document sending DTS 
> patches")
>
> These are commits
>
>   a42d2d53a6d7 ("docs: process: maintainer-soc-clean-dts: linux-next is 
> decisive")
>   d98d35d99e0f ("docs: dt: submitting-patches: Document sending DTS 
> patches")
>
> in the arm-soc tree.

My mistake, I saw them in the patchwork backlog and applied them.

I dropped them again now as they were still on the top of my branch.

    Arnd