diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-06 09:00:35 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-06 09:00:35 -0400 |
| commit | e8a3eb7d294c94b9aba76f6f936568b65355fd2c (patch) | |
| tree | bb30f804c46f3c69fc5bfa606b070a5a033c83f8 /criu-no-expert.patch | |
| parent | b25a5034bae7ef4779218d7e4eae9b95a065da04 (diff) | |
| download | kernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.tar.gz kernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.tar.xz kernel-e8a3eb7d294c94b9aba76f6f936568b65355fd2c.zip | |
Linux v3.17
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 c2d424e59..2ac9eb04c 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 3bad458f1c68..aee58b9fedfc 100644 +index 3c866db603a7..bfb3c54d5286 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1147,7 +1147,7 @@ config DEBUG_BLK_CGROUP +@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 3bad458f1c68..aee58b9fedfc 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1158,7 +1158,7 @@ config CHECKPOINT_RESTORE +@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |