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>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: linux-next: build failure after merge of the vhost tree
Date: Tue, 7 Apr 2020 13:05:42 +1000 [thread overview]
Message-ID: <20200407130542.0e3b5d9d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]
Hi all,
After merging the vhost tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/virtio/virtgpu_kms.c: In function 'virtio_gpu_init':
drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: error: 'VIRTIO_RING_F_INDIRECT_DESC' undeclared (first use in this function)
153 | if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC)) {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/virtio/virtgpu_kms.c:153:38: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
898952f9597e ("virtio: stop using legacy struct vring in kernel")
interacting with commit
5edbb5608256 ("drm/virtio: fix ring free check")
from Linus' tree (post v5.6).
I have added the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Apr 2020 12:58:26 +1000
Subject: [PATCH] drm/virtio: fix up for include file changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 023a030ca7b9..f4ea4cef5e23 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -25,6 +25,7 @@
#include <linux/virtio.h>
#include <linux/virtio_config.h>
+#include <linux/virtio_ring.h>
#include <drm/drm_file.h>
--
2.25.0
I do have to wonder why all this code has been added to the vhost tree
during the second week of the merge window (especially when I see it
rebased 4 times in one day :-(). Is it really intended for v5.7?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-04-07 3:05 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 3:05 Stephen Rothwell [this message]
2020-04-07 10:01 ` linux-next: build failure after merge of the vhost tree Michael S. Tsirkin
2020-04-07 18:58 ` Nathan Chancellor
2020-04-09 21:15 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2024-02-29 3:55 Stephen Rothwell
2024-02-29 4:01 ` Xuan Zhuo
2024-02-29 7:21 ` Xuan Zhuo
2022-08-16 1:13 Stephen Rothwell
2022-06-01 1:42 Stephen Rothwell
2022-06-01 21:57 ` Michael S. Tsirkin
2022-06-02 3:19 ` Stephen Rothwell
2021-11-25 1:23 Stephen Rothwell
2021-09-06 2:49 Stephen Rothwell
2021-09-06 2:57 ` Yongji Xie
2021-07-08 1:08 Stephen Rothwell
2021-07-08 5:37 ` Michael S. Tsirkin
2020-08-04 5:11 Stephen Rothwell
2020-08-04 5:47 ` Guennadi Liakhovetski
2020-08-04 7:04 ` Guennadi Liakhovetski
2020-08-04 9:15 ` Michael S. Tsirkin
2020-07-30 7:52 Stephen Rothwell
2020-07-28 8:11 Stephen Rothwell
2020-07-29 14:08 ` Michael S. Tsirkin
2020-05-07 5:36 Stephen Rothwell
2019-12-04 3:24 Stephen Rothwell
2019-12-07 23:45 ` Stephen Rothwell
2019-12-09 15:24 ` Michael S. Tsirkin
2018-02-07 2:04 Stephen Rothwell
2018-02-07 2:52 ` Michael S. Tsirkin
2018-02-07 2:54 ` Stephen Rothwell
2018-02-07 2:57 ` Michael S. Tsirkin
2018-02-07 4:30 ` Stephen Rothwell
2017-03-30 4:25 Stephen Rothwell
2017-04-03 6:21 ` Stephen Rothwell
2014-06-10 4:12 Stephen Rothwell
2014-06-10 9:38 ` Michael S. Tsirkin
2014-06-03 8:38 Stephen Rothwell
2014-06-09 13:19 ` Michael S. Tsirkin
2013-05-22 4:37 Stephen Rothwell
2013-05-22 5:07 ` Michael S. Tsirkin
2013-05-22 9:03 ` Michael S. Tsirkin
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=20200407130542.0e3b5d9d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kraxel@redhat.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).