Re: linux-next: manual merge of the net-next tree with the spacemit tree

[Vivian Wang <wangruikang@iscas.ac.cn>]

Hi all,

On 9/17/25 19:30, Mark Brown wrote:
> [...]
>
>   3c247a6366d58 ("riscv: dts: spacemit: Add Ethernet support for BPI-F3")
>   e32dc7a936b11 ("riscv: dts: spacemit: Add Ethernet support for Jupiter")
>
> from the net-next tree.

I originally submitted these net-next patches [1]. AFAICT, this is the
correct conflict resolution. Thank you.

Just FYI, Yixun has proposed for net-next to back out of the DTS changes
and taking them up through the spacemit tree instead [1], resolving the
conflicts in the spacemit tree. This would certainly mean less headaches
while managing pull requests, as well as allowing Yixun to take care of
code style concerns like node order. However, I do not know what the
norms here are.

Vivian "dramforever" Wang

[1]: https://lore.kernel.org/spacemit/20250914-net-k1-emac-v12-0-65b31b398f44@iscas.ac.cn/
[2]: https://lore.kernel.org/spacemit/20250916122026-GYB1255161@gentoo.org/