Re: [PATCH net-next v2] net: dsa: microchip: Add SGMII port support to KSZ9477 switch
From: Jakub Kicinski
Date: Fri May 09 2025 - 20:41:59 EST
On Tue, 6 May 2025 17:09:11 -0700 Tristram.Ha@xxxxxxxxxxxxx wrote:
> drivers/net/dsa/microchip/Kconfig | 1 +
> drivers/net/dsa/microchip/ksz9477.c | 191 ++++++++++++++++++++++++-
> drivers/net/dsa/microchip/ksz9477.h | 4 +-
> drivers/net/dsa/microchip/ksz_common.c | 36 ++++-
> drivers/net/dsa/microchip/ksz_common.h | 23 ++-
No longer applies cleanly, please rebase:
Applying: net: dsa: microchip: Add SGMII port support to KSZ9477 switch
Using index info to reconstruct a base tree...
M drivers/net/dsa/microchip/ksz_common.h
Falling back to patching base and 3-way merge...
--
pw-bot: cr