From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Michael S. Tsirkin" <mst@redhat•com>
Subject: linux-next: build failure after merge of the virtio tree
Date: Wed, 18 Mar 2015 12:47:34 +1100 [thread overview]
Message-ID: <20150318124734.629c0954@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
Hi Rusty,
After merging the virtio tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/virtio/virtio_mmio.c:250:12: error: redefinition of 'vm_generation'
static u32 vm_generation(struct virtio_device *vdev)
^
drivers/virtio/virtio_mmio.c:240:12: note: previous definition of 'vm_generation' was here
static u32 vm_generation(struct virtio_device *vdev)
^
Caused by the bad merge of commits 87e7bf1450c9 ("virtio_mmio:
generation support") from Linus' tree and cf02b2c2d1a1 ("virtio_mmio:
generation support") from the virtio tree.
I fixed it up by removing the second version of that function.
Could the virtio tree should be cleaned up to match what was sent to
Linus, please?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-18 1:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 1:47 Stephen Rothwell [this message]
2015-03-18 7:34 ` linux-next: build failure after merge of the virtio tree Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 2:37 Stephen Rothwell
2012-12-10 22:41 ` Rusty Russell
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=20150318124734.629c0954@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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