diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-20 08:58:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-20 08:58:25 -0400 |
| commit | ed8080d353cde949705f611562ab2be1a5099160 (patch) | |
| tree | 404ad523e725fa8f41bffd32879bc97f61d079fd /criu-no-expert.patch | |
| parent | 814e7c84f7e50a95290d32382ca970cb729e78ed (diff) | |
| download | kernel-ed8080d353cde949705f611562ab2be1a5099160.tar.gz kernel-ed8080d353cde949705f611562ab2be1a5099160.tar.xz kernel-ed8080d353cde949705f611562ab2be1a5099160.zip | |
Linux v4.0-8158-g09d51602cf84
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 f0f93d60e..3ecbe3b9c 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 60ec329b1959..6a3a2f63399b 100644 +index 1c9c8e500a48..6d00970e220e 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1150,7 +1150,7 @@ config DEBUG_BLK_CGROUP +@@ -1144,7 +1144,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 60ec329b1959..6a3a2f63399b 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1161,7 +1161,7 @@ config CHECKPOINT_RESTORE +@@ -1155,7 +1155,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |