2023-06-02 03:55:11

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patches in the char-misc tree

Hi all,

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

b866e7e7f995 ("misc: sram: Generate unique names for subpools")
ca3222ac4477 ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")

These are commits

21e5a2d10c8f ("misc: sram: Generate unique names for subpools")
38bd22dac71e ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")

in the arm-soc tree.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-06-02 08:14:44

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the char-misc tree

On Fri, Jun 02, 2023 at 09:54:57AM +0200, Linus Walleij wrote:
> On Fri, Jun 2, 2023 at 5:27 AM Stephen Rothwell <[email protected]> wrote:
>
> > The following commits are also in the arm-soc tree as different
> > commits (but the same patches):
> >
> > b866e7e7f995 ("misc: sram: Generate unique names for subpools")
> > ca3222ac4477 ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")
> >
> > These are commits
> >
> > 21e5a2d10c8f ("misc: sram: Generate unique names for subpools")
> > 38bd22dac71e ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")
> >
> > in the arm-soc tree.
>
> Hm hehe I was a bit confused, one misc maintainer (Arnd) merged the patches
> to the SoC tree, and another misc maintainer (Greg) merged them to the
> actual misc tree.
>
> My misunderstanding that this was handled through SoC like drivers/soc.
>
> Arnd can you drop this from the SoC tree?

No need to drop them, we can keep them both, no harm :)

2023-06-02 08:18:58

by Linus Walleij

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the char-misc tree

On Fri, Jun 2, 2023 at 5:27 AM Stephen Rothwell <[email protected]> wrote:

> The following commits are also in the arm-soc tree as different
> commits (but the same patches):
>
> b866e7e7f995 ("misc: sram: Generate unique names for subpools")
> ca3222ac4477 ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")
>
> These are commits
>
> 21e5a2d10c8f ("misc: sram: Generate unique names for subpools")
> 38bd22dac71e ("dt-bindings: sram: Add compatible for ST-Ericsson U8500 eSRAM")
>
> in the arm-soc tree.

Hm hehe I was a bit confused, one misc maintainer (Arnd) merged the patches
to the SoC tree, and another misc maintainer (Greg) merged them to the
actual misc tree.

My misunderstanding that this was handled through SoC like drivers/soc.

Arnd can you drop this from the SoC tree?

Yours,
Linus Walleij