Re: linux-next: manual merge of the vhost tree with Linus' tree

[Stephen Rothwell]

Hi Michael,

On Wed, 4 Dec 2019 14:00:52 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the vhost tree got a conflict in:
> 
>   drivers/net/ethernet/ti/cpsw.c
> 
> between commit:
> 
>   c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv")
> 
> from Linus' tree and commit:
> 
>   29fd1db09264 ("netdev: pass the stuck queue to the timeout handler")
> 
> from the vhost tree.
> 
> I fixed it up (the code has been moved, so I applied the following merge
> fix patch) and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be mentioned
> to your upstream maintainer when your tree is submitted for merging.
> You may also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Wed, 4 Dec 2019 13:55:43 +1100
> Subject: [PATCH] netdev: fix up for "pass the stuck queue to the timeout
>  handler"
> 
> cpsw_ndo_tx_timeout() was moved
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  drivers/net/ethernet/ti/cpsw_priv.c | 2 +-
>  drivers/net/ethernet/ti/cpsw_priv.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
> index b833cc1d188c..4205c52ea86b 100644
> --- a/drivers/net/ethernet/ti/cpsw_priv.c
> +++ b/drivers/net/ethernet/ti/cpsw_priv.c
> @@ -272,7 +272,7 @@ void soft_reset(const char *module, void __iomem *reg)
>  	WARN(readl_relaxed(reg) & 1, "failed to soft-reset %s\n", module);
>  }
>  
> -void cpsw_ndo_tx_timeout(struct net_device *ndev)
> +void cpsw_ndo_tx_timeout(struct net_device *ndev, unsigned int txqueue)
>  {
>  	struct cpsw_priv *priv = netdev_priv(ndev);
>  	struct cpsw_common *cpsw = priv->cpsw;
> diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h
> index bc726356a72c..b8d7b924ee3d 100644
> --- a/drivers/net/ethernet/ti/cpsw_priv.h
> +++ b/drivers/net/ethernet/ti/cpsw_priv.h
> @@ -449,7 +449,7 @@ int cpsw_rx_poll(struct napi_struct *napi_rx, int budget);
>  void cpsw_rx_vlan_encap(struct sk_buff *skb);
>  void soft_reset(const char *module, void __iomem *reg);
>  void cpsw_set_slave_mac(struct cpsw_slave *slave, struct cpsw_priv *priv);
> -void cpsw_ndo_tx_timeout(struct net_device *ndev);
> +void cpsw_ndo_tx_timeout(struct net_device *ndev, unsigned int txqueue);
>  int cpsw_need_resplit(struct cpsw_common *cpsw);
>  int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd);
>  int cpsw_ndo_set_tx_maxrate(struct net_device *ndev, int queue, u32 rate);
> -- 
> 2.24.0

I still need the above merge fix up.
-- 
Cheers,
Stephen Rothwell

Attachment: pgpjaS9mmQE_B.pgp
Description: OpenPGP digital signature