diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-16 10:55:18 -0400 |
commit | 84326caccc8490832cb7df55177c1fe2d603b9c4 (patch) | |
tree | ff4575dce4df4ecf08a768b20de9bfd8c9a3d32a /criu-no-expert.patch | |
parent | 6bfd0600ec390b1d339c46c9b4db5fa263f9fa38 (diff) | |
download | kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.gz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.tar.xz kernel-84326caccc8490832cb7df55177c1fe2d603b9c4.zip |
Linux v4.0-6817-geea3a00264cf
Diffstat (limited to 'criu-no-expert.patch')
-rw-r--r-- | criu-no-expert.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch index 5807360f2..f0f93d60e 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 98af72b9a002..73f60b09ecd1 100644 +index 60ec329b1959..6a3a2f63399b 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP +@@ -1150,7 +1150,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,15 +21,15 @@ index 98af72b9a002..73f60b09ecd1 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE +@@ -1161,7 +1161,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES - bool "Namespaces support" if EXPERT + bool "Namespaces support" + depends on MULTIUSER default !EXPERT help - Provides the way to make tasks work with different objects using -- 2.1.0 |