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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <76970eed-cb88-4a42-864a-8c2290624b72@sirena.org.uk>
Date: Wed, 17 Sep 2025 13:03:39 +0100
From: Mark Brown <broonie@...nel.org>
To: Vivian Wang <wangruikang@...as.ac.cn>
Cc: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>, Yixun Lan <dlan@...too.org>,
	Guodong Xu <guodong@...cstar.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the spacemit
 tree

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.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)