On 2015/5/12 15:52, Peter Maydell wrote: > On 12 May 2015 at 03:25, <shannon.z...@linaro.org> wrote: >> > From: Shannon Zhao <shannon.z...@linaro.org> >> > >> > Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com> >> > Signed-off-by: Shannon Zhao <shannon.z...@linaro.org> >> > --- >> > hw/s390x/s390-virtio-bus.c | 15 --------------- >> > 1 file changed, 15 deletions(-) >> > >> > diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c >> > index 1a72b56..273bd9c 100644 >> > --- a/hw/s390x/s390-virtio-bus.c >> > +++ b/hw/s390x/s390-virtio-bus.c >> > @@ -536,17 +536,12 @@ static unsigned virtio_s390_get_features(DeviceState >> > *d) >> > > Net and scsi are already fixed in master (I had to do that > as part of the conflict resolution between your virtio > patches and Cornelia's).
Ok, so need to respin? -- Shannon
