No longer applies cleanly, but git-am -3 takes care of everything except for a trivial #include conflict. I didn't test the result, though :)
- Re: [Qemu-devel] [PATCH v2 00/15] propagate Errors to do... Markus Armbruster
- Re: [Qemu-devel] [PATCH v2 00/15] propagate Errors ... Markus Armbruster