linux-next: duplicate patches in the aspeed tree

linux-next: duplicate patches in the aspeed tree

[Stephen Rothwell]

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

Hi all,

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

  52dfcf784bbf ("soc: nuvoton: Add SoC info driver for WPCM450")
  af06aa236dd7 ("ARM: Add wpcm450_defconfig for Nuvoton WPCM450")

These are commits

  7dbb4a38bff3 ("soc: nuvoton: Add SoC info driver for WPCM450")
  8012094e2925 ("ARM: Add wpcm450_defconfig for Nuvoton WPCM450")

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 aspeed tree

[Stephen Rothwell]

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

Hi Joel,

On Fri, 18 Aug 2023 02:19:11 +0000 Joel Stanley <joel@jms.id.au> wrote:
>
> On Tue, 15 Aug 2023 at 01:41, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > The following commits are also in the arm-soc-fixes tree as different
> > commits (but the same patches):
> >
> >   0955e3867b54 ("soc: aspeed: socinfo: Add kfree for kstrdup")
> >   c5835b6e7aff ("soc: aspeed: uart-routing: Use __sysfs_match_string")
> >
> > These are commits
> >
> >   6e6d847a8ce1 ("soc: aspeed: socinfo: Add kfree for kstrdup")
> >   e4ad279ae345 ("soc: aspeed: uart-routing: Use __sysfs_match_string")
> >
> > in the arm-soc-fixes tree.  
> 
> This is expected as I sent the changes as patches for Arnd to merge
> via the soc tree.
> 
> What would you like to see when this happens? Should I rebase them out
> of the aspeed tree?

They are currently not causing any conflicts (that I would need to
manually fix up), so you can just leave them it you like.

More generally, they could have gone into a separate branch that you
merge and you ask Arnd to merge so that we only have one copy.  In
particular, quite a few people have a separate "-fixes" branch for
current release bug fixes.
-- 
Cheers,
Stephen Rothwell

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

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

[Joel Stanley]

On Tue, 15 Aug 2023 at 01:41, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The following commits are also in the arm-soc-fixes tree as different
> commits (but the same patches):
>
>   0955e3867b54 ("soc: aspeed: socinfo: Add kfree for kstrdup")
>   c5835b6e7aff ("soc: aspeed: uart-routing: Use __sysfs_match_string")
>
> These are commits
>
>   6e6d847a8ce1 ("soc: aspeed: socinfo: Add kfree for kstrdup")
>   e4ad279ae345 ("soc: aspeed: uart-routing: Use __sysfs_match_string")
>
> in the arm-soc-fixes tree.

This is expected as I sent the changes as patches for Arnd to merge
via the soc tree.

What would you like to see when this happens? Should I rebase them out
of the aspeed tree?

Cheers,

Joel

linux-next: duplicate patches in the aspeed tree

[Stephen Rothwell]

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

Hi all,

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

  0955e3867b54 ("soc: aspeed: socinfo: Add kfree for kstrdup")
  c5835b6e7aff ("soc: aspeed: uart-routing: Use __sysfs_match_string")

These are commits

  6e6d847a8ce1 ("soc: aspeed: socinfo: Add kfree for kstrdup")
  e4ad279ae345 ("soc: aspeed: uart-routing: Use __sysfs_match_string")

in the arm-soc-fixes tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: duplicate patches in the aspeed tree

[Stephen Rothwell]

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

Hi all,

The following commits already exist in Linus Torvald's tree as different
commits (but the same patches):

  220a041d4cca ("ARM: dts: nuvoton,wpcm450-supermicro-x9sci-ln4f: Add GPIO line names")
  7996185ce194 ("ARM: dts: nuvoton: Remove bogus unit addresses from fixed-parti

-- 
Cheers,
Stephen Rothwell

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