diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 09:17:16 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-11 09:17:16 -0500 |
| commit | 1ef071e4db9c7521712667bb991dae3fa9dc90cb (patch) | |
| tree | 2202620683d96ac918bebc4fb30f4af9dd963038 /criu-no-expert.patch | |
| parent | 7681e91720563c3046df47d3fe585be3e441409a (diff) | |
| download | kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.gz kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.tar.xz kernel-1ef071e4db9c7521712667bb991dae3fa9dc90cb.zip | |
Linux v3.19-463-g3e8c04eb1174
- Reenable debugging options.
- Temporarily disable aarch64 patches
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 2e7ca9138..b6e46e203 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 dac9ed0f01f7..31a29fe7c555 100644 +index 5cdb1c323f62..a1c34718643d 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1128,7 +1128,7 @@ config DEBUG_BLK_CGROUP +@@ -1135,7 +1135,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index dac9ed0f01f7..31a29fe7c555 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1139,7 +1139,7 @@ config CHECKPOINT_RESTORE +@@ -1146,7 +1146,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES |