From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Grygorii Strashko <grygorii.strashko@ti.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the vhost tree with Linus' tree
Date: Mon, 9 Dec 2019 11:40:40 +1100 [thread overview]
Message-ID: <20191209114040.65a1353d@canb.auug.org.au> (raw)
In-Reply-To: <20191204140052.69d4b164@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2888 bytes --]
Hi Michael,
On Wed, 4 Dec 2019 14:00:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au>
> 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@canb.auug.org.au>
> ---
> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-12-09 0:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 3:00 linux-next: manual merge of the vhost tree with Linus' tree Stephen Rothwell
2019-12-09 0:40 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 23:05 Stephen Rothwell
2021-09-06 2:28 Stephen Rothwell
2021-09-06 2:56 ` Yongji Xie
2019-01-03 1:39 Stephen Rothwell
2015-07-24 3:59 Stephen Rothwell
2015-07-08 1:43 Stephen Rothwell
2013-05-09 2:04 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191209114040.65a1353d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=grygorii.strashko@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).