On 07.02.2013 18:46, Daniel P. Berrange wrote: > From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> > > To enable locking to be introduced to the security manager > objects later, turn virSecurityManager into a virObjectLockable > class > > Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> > --- > src/lxc/lxc_controller.c | 2 +- > src/lxc/lxc_driver.c | 4 ++-- > src/qemu/qemu_conf.h | 2 +- > src/qemu/qemu_driver.c | 6 +++--- > src/security/security_manager.c | 47 ++++++++++++++++++++++++++++++++--------- > src/security/security_manager.h | 2 -- > src/security/security_stack.c | 2 +- > tests/seclabeltest.c | 2 +- > 8 files changed, 46 insertions(+), 21 deletions(-) It seems like you squashed in changes made to HACKING in. I believe that was by mistake. However, if HACKING gets re-generated on my system, git-diff complains about it. One thing I am wondering about, HACKING is not getting re-generated even if I make a change to one of its dependency. Is it because HACKING itself isn't a dependency or in .PHONY? The other thing - should we completely drop HACKING from git and generate it with other dist hooks, like gen-AUTHORS or gen-Changelog? Do we want HACKING tracked by git? Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list