summaryrefslogtreecommitdiffstats
path: root/criu-no-expert.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
commitcc7213fcfe3019d0f935cd14e9b64c0d77bd25f4 (patch)
treedf0a7fd10cc86eaf4e3eca0ceab421e9e21fb2a0 /criu-no-expert.patch
parentb18e6e75364d806d76d99333646943f6765095fb (diff)
downloadkernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.gz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.xz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.zip
Linux v4.0-3843-gbb0fd7ab0986
Diffstat (limited to 'criu-no-expert.patch')
-rw-r--r--criu-no-expert.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index 6c488570d..5807360f2 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -9,10 +9,10 @@ Upstream-status: Fedora mustard
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/Kconfig b/init/Kconfig
-index 9a782b02e4d5..d97b5032d4b0 100644
+index 98af72b9a002..73f60b09ecd1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1135,7 +1135,7 @@ config DEBUG_BLK_CGROUP
+@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP
endif # CGROUPS
config CHECKPOINT_RESTORE
@@ -21,7 +21,7 @@ index 9a782b02e4d5..d97b5032d4b0 100644
default n
help
Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1146,7 +1146,7 @@ config CHECKPOINT_RESTORE
+@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE
If unsure, say N here.
menuconfig NAMESPACES