From: Yao Zi <me@ziyao.cc>
To: Tom Rini <trini@konsulko.com>
Cc: Yao Zi <me@ziyao.cc>, u-boot@lists.denx.de
Subject: Re: Unresolved conflicts after 0d8e33717d7e in MAINTAINERS
Date: Wed, 1 Jul 2026 11:11:52 +0000 [thread overview]
Message-ID: <akT1-Mwmc2022vTl@pie> (raw)
In-Reply-To: <akT0Mqg2JpDoKVOB@pie>
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
next parent reply other threads:[~2026-07-01 11:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <akT0Mqg2JpDoKVOB@pie>
2026-07-01 11:11 ` Yao Zi [this message]
2026-07-01 14:16 ` Unresolved conflicts after 0d8e33717d7e in MAINTAINERS Tom Rini
2026-07-01 17:12 ` Yao Zi
2026-07-01 17:16 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=akT1-Mwmc2022vTl@pie \
--to=me@ziyao.cc \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.