On 02/15/2017 11:44 AM, Jiri Denemark wrote: > Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx> > --- > > Notes: > Generated from Eduardo's work/x86-query-cpu-expansion-full branch. > > Version 2: > - no change > > .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 14710 +++++++++++++++++++ > tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 468 + > tests/qemucapabilitiestest.c | 1 + > 3 files changed, 15179 insertions(+) > create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies > create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml > I'm sure you're aware, this conflicts w/ Pavel's commit id '579fc9a2'. I didn't compare this vs. that, but I did find out if I updated w/ Pavel's changes, then patch 10 failed to apply; otherwise, without his changes I was able to get through patch 27 without 'git am -3' failures... Patch 28 failed with: Applying: cputest: Switch host CPU data scripts to model expansion fatal: sha1 information is lacking or useless (tests/cputestdata/cpu-parse.sh). error: could not build fake ancestor Patch failed at 0028 cputest: Switch host CPU data scripts to model expansion The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". But I figure some review is better than none - so I'll move on to the next patch... John -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
