Re: [PATCH v9 0/8] Add MV88E6xxx DSA driver and use on gwventana

Tim Harvey
2022-11-30T23:27:26Z

On Wed, Nov 30, 2022 at 2:30 PM Vladimir Oltean <vladimir.oltean@nxp.com> wrote:
>
> On Wed, Nov 30, 2022 at 09:42:43AM -0800, Tim Harvey wrote:
> > This series adds a DSA driver for the MV88E6xxx based on
> > drivers/net/phy/mv88e61xx and uses it in the gwventana_gw5904_defconfig.
>
> I can't apply the patches on the current master, am I doing something wrong?
>
> $ git reset --hard origin/master
>
> $ git am ~/incoming/*
> Applying: net: mdio-uclass: scan for dm mdio children on post-bind
> Applying: net: dsa: move cpu port probe to dsa_post_probe
> Applying: net: dsa: ensure dsa driver has proper ops
> Applying: net: dsa: allow rcv() and xmit() to be optional
> Applying: net: ksz9477: remove unnecessary xmit and recv functions
> Applying: net: fec: add support for DM_MDIO
> Applying: net: add MV88E6xxx DSA driver
> Applying: board: gw_ventana: enable MV88E61XX DSA support
> error: patch failed: arch/arm/dts/imx6qdl-gw5904.dtsi:212
> error: arch/arm/dts/imx6qdl-gw5904.dtsi: patch does not apply
> error: patch failed: board/gateworks/gw_ventana/gw_ventana.c:83
> error: board/gateworks/gw_ventana/gw_ventana.c: patch does not apply
> error: patch failed: configs/gwventana_gw5904_defconfig:110
> error: configs/gwventana_gw5904_defconfig: patch does not apply
> Patch failed at 0008 board: gw_ventana: enable MV88E61XX DSA support
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> 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".
>
> $ git remote show origin
> * remote origin
> Fetch URL: https://source.denx.de/u-boot/u-boot.git
> Push URL: https://source.denx.de/u-boot/u-boot.git
>
> $ git show origin/master
> commit 39b81955d38c11254b455322b9d98e07010049d6 (origin/master)
> Merge: 597e7b784dbf 5e6c069b2c6b
> Author: Tom Rini <trini@konsulko.com>
> Date: Mon Nov 28 13:12:40 2022 -0500
>
> Merge branch '2022-11-28-networking-updates-and-improvements'
>
> - LiteX Ethernet support, dwc_eth_qos fixes, re-work fixing
> CVE-2022-{30790,30552}, macb race fix, Intel XWAY PHY support
> and add wget command and TCP support.

That's the same head that I based them off of and I just did the
following and it worked fine:
cd /tmp
git clone git://git.denx.de/u-boot.git
cd u-boot
wget https://patchwork.ozlabs.org/series/330704/mbox/ -O mbox
git am mbox

Looks like only the last patch failed right?

Tim