Messages in this thread | | | Date | Sat, 25 Jun 2022 00:52:21 +0300 | From | Vladimir Oltean <> | Subject | Re: [PATCH net-next v1 3/3] net: dsa: microchip: add pause stats support |
| |
Hi Oleksij,
On Fri, Jun 24, 2022 at 02:59:02PM +0200, Oleksij Rempel wrote: > Add support for pause specific stats. > > Tested on ksz9477. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > ---
This conflicts with Arun's work:
Applying: net: dsa: add get_pause_stats support Applying: net: dsa: ar9331: add support for pause stats Applying: net: dsa: microchip: add pause stats support Using index info to reconstruct a base tree... M drivers/net/dsa/microchip/ksz9477.c M drivers/net/dsa/microchip/ksz_common.c M drivers/net/dsa/microchip/ksz_common.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/dsa/microchip/ksz_common.h CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz_common.h Auto-merging drivers/net/dsa/microchip/ksz_common.c CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz_common.c Auto-merging drivers/net/dsa/microchip/ksz9477.c CONFLICT (content): Merge conflict in drivers/net/dsa/microchip/ksz9477.c error: Failed to merge in the changes. Patch failed at 0003 net: dsa: microchip: add pause stats support
| |