linux-kernel - Re: linux-next: build failure after merge of the virtio tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 18 Mar 2015 18:04:11 +1030
From:	Rusty Russell <rusty@...tcorp.com.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Michael S. Tsirkin" <mst@...hat.com>
Subject: Re: linux-next: build failure after merge of the virtio tree

Stephen Rothwell <sfr@...b.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/