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 for Android: free password hash cracker in your pocket

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

Message-ID: <597466da-643d-4a75-b2e8-00cf7cf3fcd0@iscas.ac.cn>
Date: Wed, 17 Sep 2025 19:48:34 +0800
From: Vivian Wang <wangruikang@...as.ac.cn>
To: Mark Brown <broonie@...nel.org>, 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>
Cc: 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

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/