netdev - Re: [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x

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: <20230531225645.4b219034@kernel.org>
Date: Wed, 31 May 2023 22:56:45 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: msmulski2@...il.com
Cc: netdev@...r.kernel.org, michal.smulski@...a.com
Subject: Re: [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode
 for mv88e6393x

On Wed, 31 May 2023 10:47:20 -0700 msmulski2@...il.com wrote:
> From: Michal Smulski <michal.smulski@...a.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