[CRIU] [PATCHES] Resending

[Cyrill Gorcunov]

Pavel, I've attached them, please confirm if you see them in your inbox.

	Cyrill
-------------- next part --------------
>From e1b5a80097bcc805010839c1f7341d8b4ec16aba Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Wed, 6 Apr 2016 15:25:43 +0300
Subject: [PATCH] compel: Drop config.h from deps

We don't need it actually.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/src/main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compel/src/main.c b/compel/src/main.c
index 23c96f7af9c1..ce357aeef9a9 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -14,7 +14,6 @@
 #include <sys/mman.h>
 
 #include "compiler.h"
-#include "config.h"
 #include "piegen.h"
 
 static const char compel_cflags_pie[] = "-fpie -Wa,--noexecstack -fno-stack-protector";
-- 
2.5.5

-------------- next part --------------
>From ea96345f8351f9e26e12cf36e1a55d13d857dc67 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov at openvz.org>
Date: Wed, 6 Apr 2016 15:55:25 +0300
Subject: [PATCH] criu: opts -- Shuffle init_opts order

To match them in struct cr_options declaration.
No func change.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 criu/crtools.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 92eae7756985..5d9647ad25c8 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -59,9 +59,9 @@ void init_opts(void)
 	INIT_LIST_HEAD(&opts.veth_pairs);
 	INIT_LIST_HEAD(&opts.scripts);
 	INIT_LIST_HEAD(&opts.ext_mounts);
-	INIT_LIST_HEAD(&opts.join_ns);
 	INIT_LIST_HEAD(&opts.inherit_fds);
 	INIT_LIST_HEAD(&opts.external);
+	INIT_LIST_HEAD(&opts.join_ns);
 	INIT_LIST_HEAD(&opts.new_cgroup_roots);
 	INIT_LIST_HEAD(&opts.irmap_scan_paths);
 
-- 
2.5.5