diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 09:36:10 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 09:36:10 -0400 |
| commit | ff180079f148953e56d8bac03c582df5e3343e45 (patch) | |
| tree | 58013f4f631b6cac80196eb72ac97e46e6d43dfa /criu-no-expert.patch | |
| parent | 74b479311911cf8ebd00269d32fb4f68f96905be (diff) | |
| download | kernel-ff180079f148953e56d8bac03c582df5e3343e45.tar.gz kernel-ff180079f148953e56d8bac03c582df5e3343e45.tar.xz kernel-ff180079f148953e56d8bac03c582df5e3343e45.zip | |
Linux v3.17-8307-gf1d0d14120a8
Diffstat (limited to 'criu-no-expert.patch')
| -rw-r--r-- | criu-no-expert.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch index d6e3bb0e1..a32c53dcd 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 65ea201f38af..adfc3ba98571 100644 +index b0138f178c7c..faf5ff3b26ae 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1138,7 +1138,7 @@ config DEBUG_BLK_CGROUP +@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 65ea201f38af..adfc3ba98571 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE +@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |