Skip to content
Commit d7121ede authored by Cyrill Gorcunov's avatar Cyrill Gorcunov
Browse files

Merge branch '@xemul-mails' into @xemul



* @xemul-mails:
  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-show.c

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
parents 9360a73c a9fdf386
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment