netdev - Re: [PATCH net-next v10 00/14] xsc: ADD Yunsilicon XSC Ethernet Driver

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: <20250410160801.029ca354@kernel.org>
Date: Thu, 10 Apr 2025 16:08:01 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: "Xin Tian" <tianx@...silicon.com>
Cc: <netdev@...r.kernel.org>, <leon@...nel.org>, <andrew+netdev@...n.ch>,
 <pabeni@...hat.com>, <edumazet@...gle.com>, <davem@...emloft.net>,
 <jeff.johnson@....qualcomm.com>, <przemyslaw.kitszel@...el.com>,
 <weihg@...silicon.com>, <wanry@...silicon.com>, <jacky@...silicon.com>,
 <horms@...nel.org>, <parthiban.veerasooran@...rochip.com>,
 <masahiroy@...nel.org>, <kalesh-anakkur.purayil@...adcom.com>,
 <geert+renesas@...der.be>, <geert@...ux-m68k.org>
Subject: Re: [PATCH net-next v10 00/14] xsc: ADD Yunsilicon XSC Ethernet
 Driver

On Wed, 09 Apr 2025 17:56:39 +0800 Xin Tian wrote:
> The patch series adds the xsc driver, which will support the YunSilicon
> MS/MC/MV series of network cards. These network cards offer support for
> high-speed Ethernet and RDMA networking, with speeds of up to 200Gbps.

Does not apply, unfortunately. Please rebase & repost.

Failed to apply patch:
Applying: xsc: Add xsc driver basic framework
Using index info to reconstruct a base tree...
M	MAINTAINERS
M	drivers/net/ethernet/Kconfig
M	drivers/net/ethernet/Makefile
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ethernet/Makefile
Auto-merging drivers/net/ethernet/Kconfig
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Recorded preimage for 'MAINTAINERS'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 xsc: Add xsc driver basic framework
-- 
pw-bot: cr