From: Jakub Kicinski <kuba@kernel.org>
To: msmulski2@gmail.com
Cc: netdev@vger.kernel.org, michal.smulski@ooma.com
Subject: Re: [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x
Date: Wed, 31 May 2023 22:56:45 -0700 [thread overview]
Message-ID: <20230531225645.4b219034@kernel.org> (raw)
In-Reply-To: <20230531174720.7821-1-msmulski2@gmail.com>
On Wed, 31 May 2023 10:47:20 -0700 msmulski2@gmail.com wrote:
> From: Michal Smulski <michal.smulski@ooma.com>
>
> Enable USXGMII mode for mv88e6393x chips. Tested on Marvell 88E6191X.
Doesn't seem to apply to net-next, and the CC list is definitely way
too short. You must CC people who responded to previous version of
the patch and the maintainers.
Failed to apply patch:
Applying: net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x
Using index info to reconstruct a base tree...
M drivers/net/dsa/mv88e6xxx/chip.c
M drivers/net/dsa/mv88e6xxx/port.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/dsa/mv88e6xxx/port.c
Auto-merging drivers/net/dsa/mv88e6xxx/chip.c
CONFLICT (content): Merge conflict in drivers/net/dsa/mv88e6xxx/chip.c
Recorded preimage for 'drivers/net/dsa/mv88e6xxx/chip.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
pw-bot: cr
next prev parent reply other threads:[~2023-06-01 5:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 17:47 [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x msmulski2
2023-06-01 5:56 ` Jakub Kicinski [this message]
2023-06-01 21:47 ` Michal Smulski
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=20230531225645.4b219034@kernel.org \
--to=kuba@kernel.org \
--cc=michal.smulski@ooma.com \
--cc=msmulski2@gmail.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.