diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-06 16:34:35 -0400 |
| commit | 088a50c52e6f720fdbd321871fb3e30e241508c5 (patch) | |
| tree | 1a71348d2e970f1d6f8a1f824935e54d64d00040 /criu-no-expert.patch | |
| parent | 55b5c15b8f0c65f111c9fb61b839024d0502798c (diff) | |
| download | kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.gz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.tar.xz kernel-088a50c52e6f720fdbd321871fb3e30e241508c5.zip | |
Linux v4.2-rc1
- Disable debug options.
- Add patch to fix perf build
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 d88f5a13e..f7e1ffff1 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 021d080ecf6c..d760621a625f 100644 +index 648bb79d6b73..860ca236975f 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1136,7 +1136,7 @@ config CGROUP_WRITEBACK +@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 021d080ecf6c..d760621a625f 100644 select PROC_CHILDREN default n help -@@ -1148,7 +1148,7 @@ config CHECKPOINT_RESTORE +@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |