Skip to contentSkip to conversation

Unresolved conflicts after 0d8e33717d7e in MAINTAINERS

DISCUSSION Yao Zi 2 participants 4 messages Jul 1 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): akT0Mqg2JpDoKVOB@pie

Yao Zi

author
#1 lore raw
Quoted 16 lines · Yao Zi

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 <[email protected]>
M:      Karthikeyan Mitran <[email protected]>
M:      Prasad Bolisetty <[email protected]>
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
Quoted 9 lines

=======

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
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

4a72fd9fb09109857303ca64fd259009e1d4b554

Adding list to cc, sorry for the mistake.

Quoted 2 lines

Regards,
Yao Zi

Regards,
Yao Zi

#2 lore raw
Quoted 25 lines · Yao Zi
Quoted 24 lines · Yao Zi

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 <[email protected]>
M:      Karthikeyan Mitran <[email protected]>
M:      Prasad Bolisetty <[email protected]>
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
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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.

Signature · 1 line
Tom
author
#3 lore raw
Quoted 26 lines · Tom Rini
Quoted 25 lines · Yao Zi
Quoted 24 lines · Yao Zi

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 <[email protected]>
M:      Karthikeyan Mitran <[email protected]>
M:      Prasad Bolisetty <[email protected]>
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
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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.

Quoted 2 lines
Signature · 1 line
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

#4 lore raw
Quoted 38 lines · Yao Zi
Quoted 26 lines · Tom Rini
Quoted 25 lines · Yao Zi
Quoted 24 lines · Yao Zi

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 <[email protected]>
M:      Karthikeyan Mitran <[email protected]>
M:      Prasad Bolisetty <[email protected]>
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
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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.

Quoted 8 lines
Quoted 2 lines
Signature · 1 line
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.

Signature · 1 line
Tom