I think you need at least also the first patch that moves the code into a separate function. Otherwise you'll have to resolve the conflicts manually.
-- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1664622 Title: qemu: Missing transaction memory advertisement To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1664622/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs