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

[Mark Brown]

On Wed, Sep 17, 2025 at 07:48:34PM +0800, Vivian Wang wrote:

> 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.

Thanks.  They're pretty trivial conflicts so I'm not sure it's critical,
though like you say node order might easily end up the wrong way round
depending on how the conflict resolution gets done.

Attachment: signature.asc
Description: PGP signature