On 03/23/2018 06:17 PM, Eric Blake wrote: > On 03/23/2018 10:53 AM, Eric Blake wrote: > >> Actually, we should revert things in reverse order of the original commits, >> so that we aren't introducing yet more temporary breakage. >> >> Since you reverted: >> >> $ git describe 3fd2457 d003f7a 91ad450 0213031 --match=v\* >> v2.11.0-2595-g3fd2457d18e >> v2.11.0-2598-gd003f7a8f9c >> v2.11.0-2597-g91ad45061af >> v2.11.0-2585-g02130314d8c >> >> where the higher the middle number represents the further distance from 2.11 >> (aka newer patch), this series should be applied in the order: >> >> 2/4 (revert the newest patch first) >> 3/4 >> 1/4 >> 4/4 > > Even that didn't work - 'make check' fails with either 1/4 or 4/4 applied in > isolation, so I'm squashing them into a single patch.
Yes, "qmp: introduce QMPCapability" added an assert, that was fixed by a later on patch. So the original series was not bisectable. Anyway with Peters 4 patches all applied things are fine for me.