diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-26 09:33:38 -0400 |
| commit | 35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch) | |
| tree | 761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /criu-no-expert.patch | |
| parent | 21694f1b769f352163ed762b519cc7155dd1c97d (diff) | |
| download | kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip | |
Linux v4.1-5596-gaefbef10e3ae
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 020f73c86..ec6ac62b3 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 1c9c8e500a48..6d00970e220e 100644 +index f3e3a0d45d40..41765c00d633 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1144,7 +1144,7 @@ config DEBUG_BLK_CGROUP +@@ -1130,7 +1130,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 1c9c8e500a48..6d00970e220e 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1155,7 +1155,7 @@ config CHECKPOINT_RESTORE +@@ -1141,7 +1141,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |