[CRIU] ✗ ci.openvz.org: failure for headers: Sanitize headers

[Pavel Emelyanov]

> For more details see: https://ci.openvz.org/job/CRIU/job/criu-patchwork/737//console
> .
> 

Here's the error:

	Started by remote host 199.115.105.187
	...
	+ git checkout -f criu-dev-stable
	Previous HEAD position was 4e59b31... tests: add a test for macvlan
	HEAD is now at 36d9812... compel: cli -- Show own version with option

And that's the problem. The criu-dev's head is now at different point.

	...
	Applying: log: Swap contents of criu-log and log headers
	Using index info to reconstruct a base tree...
	M	criu/cgroup.c
	M	criu/cr-restore.c
	M	criu/cr-service.c
	M	criu/crtools.c
	M	criu/fsnotify.c
	M	criu/page-pipe.c
	M	criu/parasite-syscall.c
	M	criu/pie/parasite.c
	M	criu/pie/restorer.c
	M	criu/seize.c
	M	criu/util.c
	Falling back to patching base and 3-way merge...
	Auto-merging criu/util.c
	Auto-merging criu/seize.c
	Auto-merging criu/pie/restorer.c
	Auto-merging criu/pie/parasite.c
	Auto-merging criu/parasite-syscall.c
	Auto-merging criu/page-pipe.c
	Auto-merging criu/fsnotify.c
	CONFLICT (content): Merge conflict in criu/fsnotify.c


Of course it fails when applying to different head :(

	...
	error: Failed to merge in the changes.
	Patch failed at 0004 log: Swap contents of criu-log and log headers

And the whole build fails.

-- Pavel