On Fri, 03/16 14:31, Su Hang wrote: > Because I generate my first patch on master, it should work.
Nope. "git am" doesn't know to resolve the conflict automatically despite it being straightforward, unfortunately: http://patchew.org/QEMU/1521169105-32041-1-git-send-email-suhan...@mails.ucas.ac.cn/ Fam
