diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-14 10:54:21 -0400 |
| commit | 7f1b8a88fb1168d40d9c812ca4d71ba3655c9115 (patch) | |
| tree | f5a34fd374b9d43c0bf6bb08ad0a6ee27ab6fc9a /criu-no-expert.patch | |
| parent | ff180079f148953e56d8bac03c582df5e3343e45 (diff) | |
| download | kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.gz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.tar.xz kernel-7f1b8a88fb1168d40d9c812ca4d71ba3655c9115.zip | |
Linux v3.17-9283-g2d65a9f48fcd
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 a32c53dcd..3eadcc74a 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 b0138f178c7c..faf5ff3b26ae 100644 +index 0e1e8a14175a..71cd7226a78f 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP +@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index b0138f178c7c..faf5ff3b26ae 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE +@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |