FYI, I have pushed this big rename series. If you have outstanding patches GIT should be able to detect the rename and re-apply your changes to the new files. You'll still see conflicts if you've touched the #include lines of course. If GIT fails to deal with the renames, make sure that your $HOME/.gitconfig has something like [merge] renamelimit = 5000 There are so many renamed files, that GIT gives up too easily in its default settings. Regards, Daniel On Wed, Dec 19, 2012 at 02:58:30PM -0700, Eric Blake wrote: > On 12/19/2012 08:08 AM, Daniel Veillard wrote: > > On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote: > >> Currently the files in src/util are 50/50 split between those > >> having a 'vir' prefix and those which don't. Finish the job > >> by remaining all remaining files to have a 'vir' prefix too, > >> guaranteeing that they can't clash with system headers[1]. > >> > > Only suggested addition is change the beginning comment description > > of files like src/util/logging.c > > to read > > * virlog.c: internal logging and debugging > > instead of > > * logging.c: internal logging and debugging > > Similar comments to the rest of the series. > > > Someone else do 16 to 24 ? :-) > > Done; ACK to the remainder of the series. Turning on git rename > detection made this review MUCH easier. There's still a lot of things > we can do further, but I see no problem with getting these patches in now. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list