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] [day] [month] [year] [list]

Message-ID:
 <BYAPR14MB29181AC66013A7E044703CD6E349A@BYAPR14MB2918.namprd14.prod.outlook.com>
Date: Thu, 1 Jun 2023 21:47:43 +0000
From: Michal Smulski <michal.smulski@...a.com>
To: Jakub Kicinski <kuba@...nel.org>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode
 for mv88e6393x

Both of your suggestions are excellent.

It appears that there were a few changes made to chip.c and port.c since I submitted this patch.  I re-generated this patch against latest state of net-next(main) as v5 and will email to all maintainers and anyone who else who commented on this patch.

Regards,
Michal

-----Original Message-----
From: Jakub Kicinski <kuba@...nel.org> 
Sent: Wednesday, May 31, 2023 10:57 PM
To: msmulski2@...il.com
Cc: netdev@...r.kernel.org; Michal Smulski <michal.smulski@...a.com>
Subject: Re: [PATCH net-next v4] net: dsa: mv88e6xxx: implement USXGMII mode for mv88e6393x

CAUTION: This email is originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe.

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