lkml.org 
[lkml]   [2015]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: build failure after merge of the virtio tree
Date
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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?

Sorry, I clearly missed the failed push to virtio-next after I rebased a
fix.

Fixed now; I've modified my for-linus script to push to korg first
(which should be a noop).

Thanks,
Rusty.


\
 
 \ /
  Last update: 2015-03-18 08:41    [W:0.033 / U:0.508 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site