On Fri, Nov 21, 2008 at 06:07:36PM +0200, Avi Kivity wrote: <snip> > > Eduardo, please check the merge (there was a small conflict in reboot.c > which I fixed) once I push it. Also, when generating patches that move > files, use the -M switch: this makes it easier to review, and also > handles files that change better. The merge looks ok. I didn't know about -M, I will use it next time. Thanks! -- Eduardo