You should be able to just cherry pick the libnbd patches into nbdkit,
ie:
cd nbdkit
git fetch ../libnbd
git cherry-pick -x dc9ae0174ab1384081a57a8d54b10f8147ea6430
(maybe adjust the commit message to note that the commit
hash comes from libnbd)
Might help to make it clear where the commits come from.
Anyway, ACK, please synch nbdkit with libnbd.
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages.
http://libguestfs.org