From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A819EC433F5 for ; Mon, 7 Mar 2022 11:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233890AbiCGL0o (ORCPT ); Mon, 7 Mar 2022 06:26:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241762AbiCGL0b (ORCPT ); Mon, 7 Mar 2022 06:26:31 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BF107F26 for ; Mon, 7 Mar 2022 03:00:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646650833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5ifUJrV01iH90m49wDHf0jtuBJp0stIExCqgqIK+KXc=; b=bofJDDr7aaH3/HRkFmtQINALznCWRu7+hp1ETG4RFu8oZKYBTcahQCuBS8o0XcWcv4UWmY ENCIz+/PpXoc9qZcuJaB091998lmFtscGDzGDTzt1SSStgbqU7AIFpSFPpaJXcIccLq5WO 4WpGUVtKYAAAFtetIrRqM/3Nzbp//2g= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-185-uokCUeZ9NEKesZxGtF_YYQ-1; Mon, 07 Mar 2022 06:00:32 -0500 X-MC-Unique: uokCUeZ9NEKesZxGtF_YYQ-1 Received: by mail-ed1-f72.google.com with SMTP id l24-20020a056402231800b00410f19a3103so8399019eda.5 for ; Mon, 07 Mar 2022 03:00:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=5ifUJrV01iH90m49wDHf0jtuBJp0stIExCqgqIK+KXc=; b=j+/460WjypkOmArr58VRQqolC84Mx6L5mgN4qeZzhBWxX7euJ4wZw1CBDGCy7GhxhK K/T+unmtqNzEqp9LSijVXH1y2zkwxi0x0Zwfz4FRzNd/6Zlx1pcakuzwmtCmCuwTfJxv XM+YvczBixoQC7gY7NA5XmsZ1mnHXrkTApBCO+7UCupxcynYv5+pshLrBS1VcUqG6QIL HAriZxLYST/s6bGTwbA412BP8z1yFa6PKBL0sHJFapqdwmMg4xoOpvWkEb5/FkIzKi0t /BDJHhlh8ktrzfRmm1RXJ+Wcw/3xK8Y/Pe6kiK5zomv0MbIbzobgVBSzK8TUGbeSrfwt GOGQ== X-Gm-Message-State: AOAM532gD+LfGVVyuzeBrzNF9cfecUeNhfXejoaRKuorBMy3fYmYp6hu 2dnkRWQTwQOeWjoJN1CJOjqEvp8O73bewJg3KRJzH/qOue8v8mkk3STXvHvx7M6Pb+2cR6jAgIs YcWYRBBlPSkJ5UTLKeDcroMcQ X-Received: by 2002:a17:906:3ac7:b0:6ce:c3a1:3dcf with SMTP id z7-20020a1709063ac700b006cec3a13dcfmr8720432ejd.182.1646650831468; Mon, 07 Mar 2022 03:00:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwR1QfhoZza7jSZTfiooWn9Uk8M32U7CpHBauCfZaIHoHBbUDtSLlSD1IXQAhUKeVJEwmtw/w== X-Received: by 2002:a17:906:3ac7:b0:6ce:c3a1:3dcf with SMTP id z7-20020a1709063ac700b006cec3a13dcfmr8720421ejd.182.1646650831276; Mon, 07 Mar 2022 03:00:31 -0800 (PST) Received: from redhat.com ([2.55.138.228]) by smtp.gmail.com with ESMTPSA id b7-20020a056402350700b00415e035f7c6sm5975934edd.0.2022.03.07.03.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 03:00:30 -0800 (PST) Date: Mon, 7 Mar 2022 06:00:27 -0500 From: "Michael S. Tsirkin" To: Stephen Rothwell Cc: Xuan Zhuo , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build warning after merge of the vhost tree Message-ID: <20220307060012-mutt-send-email-mst@kernel.org> References: <20220307154011.6d456f28@canb.auug.org.au> <1646635600.9436276-1-xuanzhuo@linux.alibaba.com> <20220307211242.59fc0f0e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220307211242.59fc0f0e@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 07, 2022 at 09:12:42PM +1100, Stephen Rothwell wrote: > Hi, > > On Mon, 7 Mar 2022 14:46:40 +0800 Xuan Zhuo 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 OK, I squashed this into the problematic patch. Thanks a lot! > -- > Cheers, > Stephen Rothwell