• Cyrill Gorcunov's avatar
    Merge branch '@xemul' into dev · 1c96c5cf
    Cyrill Gorcunov authored
    * @xemul:
      crtools: Collect dumping fd parameters into one place
      crtools: Toss dump_one_fd args around
      crtools: Rename fd to lfd in dump_one_fd
      crtools: Sanitize pstree construction
      crtools: Remove unused printk_registers and co
      crtools: Deduplicate file info showing code
      crtools: Merge pstree collecting into showing
      crtools: Remove unused and wrong arrays from pstree image
      crtools: Remove lseeks after prep_cr_ calls
      crtools: Cleanup collect_pstree in cr-show
    
    Conflicts:
    	cr-dump.c
    	include/sockets.h
    	sockets.c
    
    The conflicts are mostly because of commit
    995ef5ecSigned-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
    1c96c5cf
cr-dump.c 27.2 KB