Am 04.12.2012 16:31, schrieb Stefan Hajnoczi: > On Wed, Nov 14, 2012 at 05:53:16PM -0500, Corey Bryant wrote: >> >> Signed-off-by: Corey Bryant <cor...@linux.vnet.ibm.com> >> --- >> tests/qemu-iotests/044 | 129 >> ++++++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/044.out | 5 ++ >> tests/qemu-iotests/group | 1 + >> tests/qemu-iotests/iotests.py | 12 ++++ >> 4 files changed, 147 insertions(+) >> create mode 100755 tests/qemu-iotests/044 >> create mode 100644 tests/qemu-iotests/044.out > > Thanks, applied to my block tree: > https://github.com/stefanha/qemu/commits/block
Your conflict resolution put 045 before 044 in group. Can you fix that before sending a pull request? Kevin
