linux-next: duplicate patches in the char-misc tree

linux-next: duplicate patches in the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

  acdbfa04816a ("pcmcia : make PCMCIA depend on HAS_IOMEM")
  aefc8b57af77 ("misc: open-dice: make OPEN_DICE depend on HAS_IOMEM")
  806eb9e4160d ("char: xillybus: make XILLYBUS_OF depend on HAS_IOMEM")

These are commits

  2ef95c7f4177 ("pcmcia : make PCMCIA depend on HAS_IOMEM")
  3650ce6d8409 ("misc: open-dice: make OPEN_DICE depend on HAS_IOMEM")
  420d959a77fe ("char: xillybus: make XILLYBUS_OF depend on HAS_IOMEM")

in the mm tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the char-misc tree

[Greg KH]

On Mon, Aug 07, 2023 at 03:44:57PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the mm tree as different commits
> (but the same patches):
> 
>   acdbfa04816a ("pcmcia : make PCMCIA depend on HAS_IOMEM")
>   aefc8b57af77 ("misc: open-dice: make OPEN_DICE depend on HAS_IOMEM")
>   806eb9e4160d ("char: xillybus: make XILLYBUS_OF depend on HAS_IOMEM")
> 
> These are commits
> 
>   2ef95c7f4177 ("pcmcia : make PCMCIA depend on HAS_IOMEM")
>   3650ce6d8409 ("misc: open-dice: make OPEN_DICE depend on HAS_IOMEM")
>   420d959a77fe ("char: xillybus: make XILLYBUS_OF depend on HAS_IOMEM")
> 
> in the mm tree.

Thanks for the notice, should be fine if they end up getting merged both
ways.

greg k-h

linux-next: duplicate patches in the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

  259566503782 ("firmware: arm_scpi: Convert to platform remove callback returning void")
  927e11300d8e ("firmware: arm_scmi: Convert to platform remove callback returning void")

These are commits

  8b12056b2cbf ("firmware: arm_scpi: Convert to platform remove callback returning void")
  66926739f592 ("firmware: arm_scmi: Convert to platform remove callback returning void")

in the scmi tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the char-misc tree

[Greg KH]

On Mon, Jan 08, 2024 at 02:02:54PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the scmi tree as different commits
> (but the same patches):
> 
>   259566503782 ("firmware: arm_scpi: Convert to platform remove callback returning void")
>   927e11300d8e ("firmware: arm_scmi: Convert to platform remove callback returning void")
> 
> These are commits
> 
>   8b12056b2cbf ("firmware: arm_scpi: Convert to platform remove callback returning void")
>   66926739f592 ("firmware: arm_scmi: Convert to platform remove callback returning void")
> 
> in the scmi tree.

Should be fine, thanks.

greg k-h

linux-next: duplicate patches in the char-misc tree

[Stephen Rothwell]

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

Hi all,

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

  bc1183a63057 ("misc: ocxl: main: Remove unnecessary ‘0’ values from rc")
  29eb0dc7bd1e ("misc: ocxl: link: Remove unnecessary (void*) conversions")
  0e425d703c30 ("misc: ocxl: afu_irq: Remove unnecessary (void*) conversions")
  62df29a542f9 ("misc: ocxl: context: Remove unnecessary (void*) conversions")

These are commits

  29685ea5754f ("misc: ocxl: main: Remove unnecessary ‘0’ values from rc")
  220f3ced8e42 ("misc: ocxl: link: Remove unnecessary (void*) conversions")
  84ba5d3675e2 ("misc: ocxl: afu_irq: Remove unnecessary (void*) conversions")
  82d30723d58f ("misc: ocxl: context: Remove unnecessary (void*) conversions")

in the powerpc tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the char-misc tree

[Greg KH]

On Wed, Nov 29, 2023 at 12:24:05PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commits are also in the powerpc tree as different commits
> (but the same patches):
> 
>   bc1183a63057 ("misc: ocxl: main: Remove unnecessary ‘0’ values from rc")
>   29eb0dc7bd1e ("misc: ocxl: link: Remove unnecessary (void*) conversions")
>   0e425d703c30 ("misc: ocxl: afu_irq: Remove unnecessary (void*) conversions")
>   62df29a542f9 ("misc: ocxl: context: Remove unnecessary (void*) conversions")
> 
> These are commits
> 
>   29685ea5754f ("misc: ocxl: main: Remove unnecessary ‘0’ values from rc")
>   220f3ced8e42 ("misc: ocxl: link: Remove unnecessary (void*) conversions")
>   84ba5d3675e2 ("misc: ocxl: afu_irq: Remove unnecessary (void*) conversions")
>   82d30723d58f ("misc: ocxl: context: Remove unnecessary (void*) conversions")
> 
> in the powerpc tree.

Thanks, that should be fine, I didn't realize these ended up in the
powerpc tree already.

greg k-h

linux-next: duplicate patches in the char-misc tree

[Stephen Rothwell]

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

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

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

Re: linux-next: duplicate patches in the char-misc tree

[Linus Walleij]

On Fri, Jun 2, 2023 at 5:27 AM Stephen Rothwell <sfr@canb.auug.org.au> 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

Re: linux-next: duplicate patches in the char-misc tree

[Greg KH]

On Fri, Jun 02, 2023 at 09:54:57AM +0200, Linus Walleij wrote:
> On Fri, Jun 2, 2023 at 5:27 AM Stephen Rothwell <sfr@canb.auug.org.au> 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 :)