From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: linux-next: build warning after merge of the vhost tree
Date: Wed, 9 Mar 2022 14:15:44 +0800 [thread overview]
Message-ID: <1646806544.818761-1-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220309171300.0500a07e@canb.auug.org.au>
On Wed, 9 Mar 2022 17:13:00 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Michael,
>
> On Mon, 7 Mar 2022 06:00:27 -0500 "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >
> > On Mon, Mar 07, 2022 at 09:12:42PM +1100, Stephen Rothwell wrote:
> > >
> > > On Mon, 7 Mar 2022 14:46:40 +0800 Xuan Zhuo <xuanzhuo@linux.alibaba.com> wrote:
> > > >
> > > > Can you help me test this patch? I don't have an arm environment around me.
> > > >
> > > > Thanks
> > > >
> > > >
> > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > > > index 1fa2d632a994..4d629d1ea894 100644
> > > > --- a/drivers/net/virtio_net.c
> > > > +++ b/drivers/net/virtio_net.c
> > > > @@ -1820,7 +1820,7 @@ static int virtnet_rx_vq_reset(struct virtnet_info *vi,
> > > >
> > > > err:
> > > > netdev_err(vi->dev,
> > > > - "reset rx reset vq fail: rx queue index: %ld err: %d\n",
> > > > + "reset rx reset vq fail: rx queue index: %td err: %d\n",
> > > > rq - vi->rq, err);
> > > > virtnet_napi_enable(rq->vq, &rq->napi);
> > > > return err;
> > > > @@ -1870,7 +1870,7 @@ static int virtnet_tx_vq_reset(struct virtnet_info *vi,
> > > >
> > > > err:
> > > > netdev_err(vi->dev,
> > > > - "reset tx reset vq fail: tx queue index: %ld err: %d\n",
> > > > + "reset tx reset vq fail: tx queue index: %td err: %d\n",
> > > > sq - vi->sq, err);
> > > > virtnet_napi_tx_enable(vi, sq->vq, &sq->napi);
> > > > return err;
> > >
> > > I had to apply that by hand, but it does work.
> > >
> > > Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > OK, I squashed this into the problematic patch. Thanks a lot!
>
> The warnings have reappeared today :-( and this fixup is not applied.
> Something got lost in the rebase/rewrite?
Sorry for that.
The patch of the fix I submitted before was not merged locally. When the patch
set of v7 was released yesterday, this fix patch was not included.
> --
> Cheers,
> Stephen Rothwell
>
next prev parent reply other threads:[~2022-03-09 6:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 4:40 linux-next: build warning after merge of the vhost tree Stephen Rothwell
2022-03-07 6:46 ` Xuan Zhuo
2022-03-07 9:17 ` Michael S. Tsirkin
2022-03-07 9:41 ` Xuan Zhuo
2022-03-07 10:12 ` Stephen Rothwell
2022-03-07 11:00 ` Michael S. Tsirkin
2022-03-09 6:13 ` Stephen Rothwell
2022-03-09 6:15 ` Xuan Zhuo [this message]
2022-03-09 6:30 ` Xuan Zhuo
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 4:10 Stephen Rothwell
2023-03-22 1:32 Stephen Rothwell
2023-03-22 2:24 ` Michael S. Tsirkin
2022-12-19 23:59 Stephen Rothwell
2022-12-20 6:01 ` Michael S. Tsirkin
2022-12-20 7:04 ` Ricardo Cañuelo
2022-08-11 1:59 Stephen Rothwell
2022-08-11 6:45 ` Ricardo Cañuelo
2021-07-06 2:37 Stephen Rothwell
2020-06-09 3:25 Stephen Rothwell
2019-12-16 3:49 Stephen Rothwell
2019-11-15 4:36 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=1646806544.818761-1-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sfr@canb.auug.org.au \
/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).