Il 21/02/2014 12:08, Kevin Wolf ha scritto: > Am 20.02.2014 um 18:29 hat Paolo Bonzini geschrieben: >> Il 19/02/2014 15:06, Kevin Wolf ha scritto: >>> Thanks, applied to the block branch. >> >> Conflicts with master... to help you rebasing I put my own version >> at block-open-errors on git://github.com/bonzini/qemu.git. > > Thanks, but rebasing is easier than removing patches, pulling and > revalidating that there were no other changes. I hope my rebase didn't > break anything - if it does, complain to Markus.
All fine. The idea was more to let you do a double check with diff \ <(git log -p --reverse kwolf/block~20..kwolf/block) \ <(git log -p --reverse bonzini/block-open-errors~20..bonzini/block-open-errors) Paolo