criu/include
Cyrill Gorcunov 1c96c5cff0 Merge branch '@xemul' into dev
* @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
995ef5eca3

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
2012-01-13 21:39:14 +04:00
..
atomic.h Gather futex helpers into lock.h 2011-12-26 23:54:18 +04:00
bitops.h restore: Add mutexes via futex syscall and order threads creation 2011-11-18 16:09:01 +04:00
compiler.h Add ALIGN helper 2011-11-16 18:16:12 +04:00
crtools.h crtools: Make close_cr_fdset being safe to be called with closed fd-set 2012-01-12 21:25:19 +04:00
files.h restore: Learn to work with shared struct file-s 2012-01-11 16:01:44 +04:00
image.h crtools: Remove unused and wrong arrays from pstree image 2012-01-12 22:09:58 +04:00
libnetlink.h net: Define named constant for nlmsg_seq 2011-12-27 20:13:18 +04:00
list.h Initial commit 2011-09-23 12:00:45 +04:00
lock.h lock: Add cr_wait_init helper 2012-01-04 16:40:13 +04:00
log.h Move logging functions to log.c 2011-12-19 18:52:50 +04:00
parasite-syscall.h parasite: Embed vma_area into control block 2012-01-13 20:16:20 +04:00
parasite.h parasite: Make max size for path being PATH_MAX 2011-12-19 15:34:37 +04:00
ptrace.h dump: Drop unneeded #includes 2011-12-19 23:18:17 +04:00
restorer.h restore: No need to track pid of main shmems, open map_files/ via /proc/self 2012-01-13 17:09:08 +04:00
sockets.h Merge branch '@xemul' into dev 2012-01-13 21:39:14 +04:00
syscall-codes.h syscalls: Add sys_msync helper 2012-01-04 16:40:35 +04:00
syscall.h syscalls: Add sys_msync helper 2012-01-04 16:40:35 +04:00
types.h dump: Drop unneeded #includes 2011-12-19 23:18:17 +04:00
unix_diag.h sockets: Update unix_diag.h 2012-01-10 17:26:50 +04:00
util.h Merge branch '@xemul' into dev 2012-01-13 21:39:14 +04:00