From 6a91557e4cd508858eca5aba5406a9109861d4de Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Wed, 20 Aug 2014 13:22:24 -0400
Subject: Patch file cleanup

Do a couple things here:

- Split the mega-patches into individual patches.  Should help with rebasing.
- Make all patches 'git am' acceptable.

There should be no functional or actual code differences from before
---
 criu-no-expert.patch | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'criu-no-expert.patch')

diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index 28c8a987d..4c3573b24 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -1,11 +1,19 @@
+From cb32e566a709fd6a7e36ef7a41b2047fcdfb921d Mon Sep 17 00:00:00 2001
+From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
+Date: Wed, 30 Jan 2013 10:55:31 -0500
+Subject: [PATCH] criu: no expert
+
 Bugzilla: N/A
 Upstream-status: Fedora mustard
+---
+ init/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
+index 3bad458f1c68..aee58b9fedfc 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+@@ -1147,7 +1147,7 @@ config DEBUG_BLK_CGROUP
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
@@ -14,7 +22,7 @@ index be8b7f5..7461760 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
+@@ -1158,7 +1158,7 @@ config CHECKPOINT_RESTORE
  	  If unsure, say N here.
  
  menuconfig NAMESPACES
@@ -23,3 +31,6 @@ index be8b7f5..7461760 100644
  	default !EXPERT
  	help
  	  Provides the way to make tasks work with different objects using
+-- 
+1.9.3
+
-- 
cgit