* Re: Unresolved conflicts after 0d8e33717d7e in MAINTAINERS
[not found] <akT0Mqg2JpDoKVOB@pie>
@ 2026-07-01 11:11 ` Yao Zi
2026-07-01 14:16 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Yao Zi @ 2026-07-01 11:11 UTC (permalink / raw)
To: Tom Rini; +Cc: Yao Zi, u-boot
On Wed, Jul 01, 2026 at 11:04:18AM +0000, Yao Zi wrote:
> Hi list,
>
> I noticed merge commit 0d8e33717d7e ("Merge patch series "arm: aspeed:
> add initial AST2700 SoC support""), which has already landed in next,
> seems to leave a part of conflicted changes unresolved.
>
> ARM AXIADO AX3005 SCM3005
> M: Siu Ming Tong <smtong@axiado.com>
> M: Karthikeyan Mitran <kmitran@axiado.com>
> M: Prasad Bolisetty <pbolisetty@axiado.com>
> S: Maintained
> F: arch/arm/dts/ax3005*
> F: arch/arm/mach-axiado/
> F: board/axiado/scm3005/
> F: configs/ax3005_scm3005_defconfig
> F: include/configs/ax3005-scm3005.h
> =======
> F: drivers/pinctrl/aspeed/
> F: drivers/pwm/pwm-aspeed.c
> F: drivers/ram/aspeed/
> F: drivers/reset/reset-ast*.c
> F: drivers/watchdog/ast_wdt.c
> N: aspeed
> N: ast2700
> >>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554
Adding list to cc, sorry for the mistake.
> Regards,
> Yao Zi
Regards,
Yao Zi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Unresolved conflicts after 0d8e33717d7e in MAINTAINERS
2026-07-01 11:11 ` Unresolved conflicts after 0d8e33717d7e in MAINTAINERS Yao Zi
@ 2026-07-01 14:16 ` Tom Rini
2026-07-01 17:12 ` Yao Zi
0 siblings, 1 reply; 4+ messages in thread
From: Tom Rini @ 2026-07-01 14:16 UTC (permalink / raw)
To: Yao Zi; +Cc: u-boot
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]
On Wed, Jul 01, 2026 at 11:11:52AM +0000, Yao Zi wrote:
> On Wed, Jul 01, 2026 at 11:04:18AM +0000, Yao Zi wrote:
> > Hi list,
> >
> > I noticed merge commit 0d8e33717d7e ("Merge patch series "arm: aspeed:
> > add initial AST2700 SoC support""), which has already landed in next,
> > seems to leave a part of conflicted changes unresolved.
> >
> > ARM AXIADO AX3005 SCM3005
> > M: Siu Ming Tong <smtong@axiado.com>
> > M: Karthikeyan Mitran <kmitran@axiado.com>
> > M: Prasad Bolisetty <pbolisetty@axiado.com>
> > S: Maintained
> > F: arch/arm/dts/ax3005*
> > F: arch/arm/mach-axiado/
> > F: board/axiado/scm3005/
> > F: configs/ax3005_scm3005_defconfig
> > F: include/configs/ax3005-scm3005.h
> > =======
> > F: drivers/pinctrl/aspeed/
> > F: drivers/pwm/pwm-aspeed.c
> > F: drivers/ram/aspeed/
> > F: drivers/reset/reset-ast*.c
> > F: drivers/watchdog/ast_wdt.c
> > N: aspeed
> > N: ast2700
> > >>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554
>
> Adding list to cc, sorry for the mistake.
I thought this was resolved in the merge commit? I don't see that in the
current file at the tip of the next branch.
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Unresolved conflicts after 0d8e33717d7e in MAINTAINERS
2026-07-01 14:16 ` Tom Rini
@ 2026-07-01 17:12 ` Yao Zi
2026-07-01 17:16 ` Tom Rini
0 siblings, 1 reply; 4+ messages in thread
From: Yao Zi @ 2026-07-01 17:12 UTC (permalink / raw)
To: Tom Rini, Yao Zi; +Cc: u-boot
On Wed, Jul 01, 2026 at 08:16:46AM -0600, Tom Rini wrote:
> On Wed, Jul 01, 2026 at 11:11:52AM +0000, Yao Zi wrote:
> > On Wed, Jul 01, 2026 at 11:04:18AM +0000, Yao Zi wrote:
> > > Hi list,
> > >
> > > I noticed merge commit 0d8e33717d7e ("Merge patch series "arm: aspeed:
> > > add initial AST2700 SoC support""), which has already landed in next,
> > > seems to leave a part of conflicted changes unresolved.
> > >
> > > ARM AXIADO AX3005 SCM3005
> > > M: Siu Ming Tong <smtong@axiado.com>
> > > M: Karthikeyan Mitran <kmitran@axiado.com>
> > > M: Prasad Bolisetty <pbolisetty@axiado.com>
> > > S: Maintained
> > > F: arch/arm/dts/ax3005*
> > > F: arch/arm/mach-axiado/
> > > F: board/axiado/scm3005/
> > > F: configs/ax3005_scm3005_defconfig
> > > F: include/configs/ax3005-scm3005.h
> > > =======
> > > F: drivers/pinctrl/aspeed/
> > > F: drivers/pwm/pwm-aspeed.c
> > > F: drivers/ram/aspeed/
> > > F: drivers/reset/reset-ast*.c
> > > F: drivers/watchdog/ast_wdt.c
> > > N: aspeed
> > > N: ast2700
> > > >>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554
> >
> > Adding list to cc, sorry for the mistake.
>
> I thought this was resolved in the merge commit? I don't see that in the
> current file at the tip of the next branch.
It's strange. It's still there in the tip of next branch fetched in my
side, and I could find it on both U-Boot's GitLab instance[1] and
GitHub[2] as well.
> --
> Tom
Best regards,
Yao Zi
[1]: https://source.denx.de/u-boot/u-boot/-/blob/next/MAINTAINERS?ref_type=heads#L235
[2]: https://github.com/u-boot/u-boot/blob/5602e89a834ccbedc686053b14206c062a144107/MAINTAINERS#L235
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Unresolved conflicts after 0d8e33717d7e in MAINTAINERS
2026-07-01 17:12 ` Yao Zi
@ 2026-07-01 17:16 ` Tom Rini
0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2026-07-01 17:16 UTC (permalink / raw)
To: Yao Zi; +Cc: u-boot
[-- Attachment #1: Type: text/plain, Size: 1940 bytes --]
On Wed, Jul 01, 2026 at 05:12:05PM +0000, Yao Zi wrote:
> On Wed, Jul 01, 2026 at 08:16:46AM -0600, Tom Rini wrote:
> > On Wed, Jul 01, 2026 at 11:11:52AM +0000, Yao Zi wrote:
> > > On Wed, Jul 01, 2026 at 11:04:18AM +0000, Yao Zi wrote:
> > > > Hi list,
> > > >
> > > > I noticed merge commit 0d8e33717d7e ("Merge patch series "arm: aspeed:
> > > > add initial AST2700 SoC support""), which has already landed in next,
> > > > seems to leave a part of conflicted changes unresolved.
> > > >
> > > > ARM AXIADO AX3005 SCM3005
> > > > M: Siu Ming Tong <smtong@axiado.com>
> > > > M: Karthikeyan Mitran <kmitran@axiado.com>
> > > > M: Prasad Bolisetty <pbolisetty@axiado.com>
> > > > S: Maintained
> > > > F: arch/arm/dts/ax3005*
> > > > F: arch/arm/mach-axiado/
> > > > F: board/axiado/scm3005/
> > > > F: configs/ax3005_scm3005_defconfig
> > > > F: include/configs/ax3005-scm3005.h
> > > > =======
> > > > F: drivers/pinctrl/aspeed/
> > > > F: drivers/pwm/pwm-aspeed.c
> > > > F: drivers/ram/aspeed/
> > > > F: drivers/reset/reset-ast*.c
> > > > F: drivers/watchdog/ast_wdt.c
> > > > N: aspeed
> > > > N: ast2700
> > > > >>>>>>> 4a72fd9fb09109857303ca64fd259009e1d4b554
> > >
> > > Adding list to cc, sorry for the mistake.
> >
> > I thought this was resolved in the merge commit? I don't see that in the
> > current file at the tip of the next branch.
>
> It's strange. It's still there in the tip of next branch fetched in my
> side, and I could find it on both U-Boot's GitLab instance[1] and
> GitHub[2] as well.
>
> > --
> > Tom
>
> Best regards,
> Yao Zi
>
> [1]: https://source.denx.de/u-boot/u-boot/-/blob/next/MAINTAINERS?ref_type=heads#L235
> [2]: https://github.com/u-boot/u-boot/blob/5602e89a834ccbedc686053b14206c062a144107/MAINTAINERS#L235
Oh, sigh, I see it now, thank you.
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-07-01 17:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <akT0Mqg2JpDoKVOB@pie>
2026-07-01 11:11 ` Unresolved conflicts after 0d8e33717d7e in MAINTAINERS Yao Zi
2026-07-01 14:16 ` Tom Rini
2026-07-01 17:12 ` Yao Zi
2026-07-01 17:16 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox