mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-18 00:58:31 +00:00
* @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
|
||
|---|---|---|
| .. | ||
| atomic.h | ||
| bitops.h | ||
| compiler.h | ||
| crtools.h | ||
| files.h | ||
| image.h | ||
| libnetlink.h | ||
| list.h | ||
| lock.h | ||
| log.h | ||
| parasite-syscall.h | ||
| parasite.h | ||
| ptrace.h | ||
| restorer.h | ||
| sockets.h | ||
| syscall-codes.h | ||
| syscall.h | ||
| types.h | ||
| unix_diag.h | ||
| util.h | ||