Failed in applying to current master (
apply log)
Maintainers: Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>
docs/interop/nbd.txt | 1 +
include/block/nbd.h | 5 +-
nbd/nbd-internal.h | 5 +-
block/nbd.c | 67 ++--
nbd/client-connection.c | 2 +-
nbd/client.c | 124 ++++---
nbd/server.c | 426 ++++++++++++++++++-----
qemu-nbd.c | 4 +
.mailmap | 16 +-
block/trace-events | 1 +
nbd/trace-events | 5 +-
tests/qemu-iotests/223.out | 18 +-
tests/qemu-iotests/233.out | 4 +
tests/qemu-iotests/241.out | 3 +
tests/qemu-iotests/307.out | 15 +-
tests/qemu-iotests/tests/nbd-qemu-allocation.out | 3 +-
16 files changed, 538 insertions(+), 161 deletions(-)