Merge branch 'fix-socket-opts' of https://github.com/DongSunchao/criu into fix-socket-opts

Author: root

.gitignore

@@ -33,5 +33,3 @@ compel/include/asm
 include/common/asm
 include/common/config.h
 build/**
-.vscode/setting.json
-.gitignore