| commit | 4c3bad2f638cebe70864952a054ebeed6327daee | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:51:32 +0000 (28 11:51 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:52:42 +0000 (28 11:52 +0000) | ||
| tree | e3bfa75a5f567befc3a7b7ba96d03bcfe98398c4 | treesnapshot (tar.gz zip) |
| parent | abe5224ddedc058fc780b0f288d0bb277d514510 | commitdiff |
| parent | 38c75be3139a117b02350dbda9d48d47aa57fa3d | commitdiff |
Merge commit '38c75be3139a117b02350dbda9d48d47aa57fa3d' into upstream-merge
* commit '38c75be3139a117b02350dbda9d48d47aa57fa3d':
net: make tap_receive() re-use tap_receive_iov() code
net: import linux tap ioctl definitions
net: remove unused includes of if_tun.h and if_tap.h
Revert "qcow2: Bring synchronous read/write back to life"
linux-aio: Honour AsyncContext
posix-aio-compat: Honour AsyncContext
block: Use new AsyncContext for bdrv_read/write emulation
Introduce contexts for asynchronous callbacks
Split out bottom halves
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '38c75be3139a117b02350dbda9d48d47aa57fa3d':
net: make tap_receive() re-use tap_receive_iov() code
net: import linux tap ioctl definitions
net: remove unused includes of if_tun.h and if_tap.h
Revert "qcow2: Bring synchronous read/write back to life"
linux-aio: Honour AsyncContext
posix-aio-compat: Honour AsyncContext
block: Use new AsyncContext for bdrv_read/write emulation
Introduce contexts for asynchronous callbacks
Split out bottom halves
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>