summaryrefslogtreecommitdiffstats
path: root/criu-no-expert.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
commit35ac9a875942baf213b210ef2954da4fa0f3b463 (patch)
treee2ed984e81584a9a89cac4ba17a8e7ee65f690aa /criu-no-expert.patch
parentc01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff)
downloadkernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip
Linux v3.17-6136-gc798360cd143
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 7583f7418..d6e3bb0e1 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 5e701ec1be55..abb2fc8f1b7a 100644
+index 65ea201f38af..adfc3ba98571 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP
+@@ -1138,7 +1138,7 @@ config DEBUG_BLK_CGROUP
endif # CGROUPS
config CHECKPOINT_RESTORE
@@ -21,7 +21,7 @@ index 5e701ec1be55..abb2fc8f1b7a 100644
default n
help
Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE
+@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE
If unsure, say N here.
menuconfig NAMESPACES