* linux-next: duplicate patches in the aspeed tree
@ 2023-01-04 21:33 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2023-01-04 21:33 UTC (permalink / raw)
To: Joel Stanley; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread* linux-next: duplicate patches in the aspeed tree
@ 2023-02-01 21:47 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2023-02-01 21:47 UTC (permalink / raw)
To: Joel Stanley, Olof Johansson, Arnd Bergmann
Cc: ARM, Jonathan Neuschäfer, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread* linux-next: duplicate patches in the aspeed tree
@ 2023-08-15 1:41 Stephen Rothwell
2023-08-18 2:19 ` Joel Stanley
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2023-08-15 1:41 UTC (permalink / raw)
To: Joel Stanley, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patches in the aspeed tree
2023-08-15 1:41 Stephen Rothwell
@ 2023-08-18 2:19 ` Joel Stanley
2023-08-18 3:21 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2023-08-18 2:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patches in the aspeed tree
2023-08-18 2:19 ` Joel Stanley
@ 2023-08-18 3:21 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2023-08-18 3:21 UTC (permalink / raw)
To: Joel Stanley
Cc: Olof Johansson, Arnd Bergmann, ARM, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: duplicate patches in the aspeed tree
@ 2025-05-22 1:30 Stephen Rothwell
2025-05-22 1:40 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2025-05-22 1:30 UTC (permalink / raw)
To: Joel Stanley; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
Hi all,
The following commits are also in the arm-soc tree as different commits
(but the same patches):
28fe68179368 ("arm64: dts: nuvoton: Add pinctrl")
82f50ddf894e ("ARM: aspeed: Don't select SRAM")
856d11d63f85 ("soc: aspeed: lpc: Fix impossible judgment condition")
f3089a4fc247 ("soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop()")
--
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 patches in the aspeed tree
2025-05-22 1:30 Stephen Rothwell
@ 2025-05-22 1:40 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2025-05-22 1:40 UTC (permalink / raw)
To: Joel Stanley, Arnd Bergmann
Cc: Linux Kernel Mailing List, Linux Next Mailing List, ARM
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi all,
[cc arm-soc]
On Thu, 22 May 2025 11:30:33 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in the arm-soc tree as different commits
> (but the same patches):
>
> 28fe68179368 ("arm64: dts: nuvoton: Add pinctrl")
> 82f50ddf894e ("ARM: aspeed: Don't select SRAM")
> 856d11d63f85 ("soc: aspeed: lpc: Fix impossible judgment condition")
> f3089a4fc247 ("soc: aspeed: Add NULL check in aspeed_lpc_enable_snoop()")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-05-22 1:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04 21:33 linux-next: duplicate patches in the aspeed tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 21:47 Stephen Rothwell
2023-08-15 1:41 Stephen Rothwell
2023-08-18 2:19 ` Joel Stanley
2023-08-18 3:21 ` Stephen Rothwell
2025-05-22 1:30 Stephen Rothwell
2025-05-22 1:40 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox