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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:	Mon, 20 Apr 2015 14:54:18 +1000
From:	Stephen Rothwell <>
To:	"Michael S. Tsirkin" <>,
	Rusty Russell <>
Subject: linux-next: manual merge of the vhost tree with the virtio tree

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
drivers/virtio/virtio_balloon.c between commit df81b29c7b81
("virtio_balloon: transitional interface") from the virtio tree and
commit 263f23c089f2 ("virtio_balloon: transitional interface") from the
vhost tree.

I fixed it up (by using the version of the files from the virtio tree)
and can carry the fix as necessary.  Please clean up this mess ...

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists