Re: [Qemu-stable] [PATCH v3 2/2] tests: update expected SSDT for floppy changes

[Roman Kagan]

On Tue, Dec 22, 2015 at 06:41:47PM +0200, Michael S. Tsirkin wrote:
> On Fri, Dec 18, 2015 at 10:32:30PM +0300, Roman Kagan wrote:
> > Update the expected SSDTs to reflect the changes introduced in the
> > previous patch.
> > 
> > Signed-off-by: Roman Kagan <address@hidden>
> > Signed-off-by: Denis V. Lunev <address@hidden>
> > CC: Michael S. Tsirkin <address@hidden>
> > CC: Igor Mammedov <address@hidden>
> > CC: Paolo Bonzini <address@hidden>
> > CC: Richard Henderson <address@hidden>
> > CC: Eduardo Habkost <address@hidden>
> > CC: John Snow <address@hidden>
> > CC: Kevin Wolf <address@hidden>
> 
> Something strange is going on here.
> If I apply your patch and this one on top, I get
> a diff in SSDT.

Aren't you by chance applying it on top of other patches that may affect
SSDT?  I double-checked the series on top of

commit 5dc42c186d63b7b338594fc071cf290805dcc5a5
Merge: c595b21 7236975
Author: Peter Maydell <address@hidden>
Date:   Tue Dec 22 14:21:42 2015 +0000

    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' 
into staging


and it passes OK...

Roman.