Unresolved conflicts after 0d8e33717d7e in MAINTAINERS

[Tom Rini]

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 at axiado.com>
> > M:      Karthikeyan Mitran <kmitran at axiado.com>
> > M:      Prasad Bolisetty <pbolisetty at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20260701/b2637064/attachment.sig>