From: Jakub Kicinski <kuba@kernel.org>
To: "Xin Tian" <tianx@yunsilicon.com>
Cc: <netdev@vger.kernel.org>, <leon@kernel.org>,
<andrew+netdev@lunn.ch>, <pabeni@redhat.com>,
<edumazet@google.com>, <davem@davemloft.net>,
<jeff.johnson@oss.qualcomm.com>, <przemyslaw.kitszel@intel.com>,
<weihg@yunsilicon.com>, <wanry@yunsilicon.com>,
<jacky@yunsilicon.com>, <horms@kernel.org>,
<parthiban.veerasooran@microchip.com>, <masahiroy@kernel.org>,
<kalesh-anakkur.purayil@broadcom.com>, <geert+renesas@glider.be>,
<geert@linux-m68k.org>
Subject: Re: [PATCH net-next v10 00/14] xsc: ADD Yunsilicon XSC Ethernet Driver
Date: Thu, 10 Apr 2025 16:08:01 -0700 [thread overview]
Message-ID: <20250410160801.029ca354@kernel.org> (raw)
In-Reply-To: <20250409095552.2027686-1-tianx@yunsilicon.com>
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
next prev parent reply other threads:[~2025-04-10 23:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-09 9:56 [PATCH net-next v10 00/14] xsc: ADD Yunsilicon XSC Ethernet Driver Xin Tian
2025-04-09 9:55 ` [PATCH net-next v10 01/14] xsc: Add xsc driver basic framework Xin Tian
2025-04-09 9:55 ` [PATCH net-next v10 02/14] xsc: Enable command queue Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 03/14] xsc: Add hardware setup APIs Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 04/14] xsc: Add qp and cq management Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 05/14] xsc: Add eq and alloc Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 06/14] xsc: Init pci irq Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 07/14] xsc: Init auxiliary device Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 08/14] xsc: Add ethernet interface Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 09/14] xsc: Init net device Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 10/14] xsc: Add eth needed qp and cq apis Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 11/14] xsc: ndo_open and ndo_stop Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 12/14] xsc: Add ndo_start_xmit Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 13/14] xsc: Add eth reception data path Xin Tian
2025-04-09 9:56 ` [PATCH net-next v10 14/14] xsc: add ndo_get_stats64 Xin Tian
2025-04-10 23:08 ` Jakub Kicinski [this message]
2025-04-11 3:36 ` [PATCH net-next v10 00/14] xsc: ADD Yunsilicon XSC Ethernet Driver Xin Tian
-- strict thread matches above, loose matches on Subject: below --
2025-04-11 6:53 Xin Tian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250410160801.029ca354@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geert+renesas@glider.be \
--cc=geert@linux-m68k.org \
--cc=horms@kernel.org \
--cc=jacky@yunsilicon.com \
--cc=jeff.johnson@oss.qualcomm.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=leon@kernel.org \
--cc=masahiroy@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=parthiban.veerasooran@microchip.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=tianx@yunsilicon.com \
--cc=wanry@yunsilicon.com \
--cc=weihg@yunsilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).