diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-11-20 10:00:57 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2017-11-20 10:01:00 -0800 |
| commit | 0805625aea4a35fb8aae0c37e06da6921e8029ac (patch) | |
| tree | 36e1188d98a3a58e26349bbaa79f8ac5f9697093 /criu-no-expert.patch | |
| parent | 8221dd34f7fb80fdeccd6db30a623514134e2b4d (diff) | |
| download | kernel-0805625aea4a35fb8aae0c37e06da6921e8029ac.tar.gz kernel-0805625aea4a35fb8aae0c37e06da6921e8029ac.tar.xz kernel-0805625aea4a35fb8aae0c37e06da6921e8029ac.zip | |
Linux v4.14-12891-gc8a0739b185d
Also turn off a powerpc crypto drive that was failing to compile
Diffstat (limited to 'criu-no-expert.patch')
| -rw-r--r-- | criu-no-expert.patch | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/criu-no-expert.patch b/criu-no-expert.patch index f7e1ffff1..430bfd095 100644 --- a/criu-no-expert.patch +++ b/criu-no-expert.patch @@ -1,3 +1,4 @@ +From 235b02d70a6a9837896c2ff4ca9d03f172cc4281 Mon Sep 17 00:00:00 2001 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> Date: Wed, 30 Jan 2013 10:55:31 -0500 Subject: [PATCH] criu: no expert @@ -9,24 +10,27 @@ Upstream-status: Fedora mustard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig -index 648bb79d6b73..860ca236975f 100644 +index 2934249fba46..19d9ee8c120b 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1137,7 +1137,7 @@ config CGROUP_WRITEBACK +@@ -871,7 +871,7 @@ config SOCK_CGROUP_DATA endif # CGROUPS - config CHECKPOINT_RESTORE -- bool "Checkpoint/restore support" if EXPERT -+ bool "Checkpoint/restore support" - select PROC_CHILDREN - default n - help -@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE - If unsure, say N here. - menuconfig NAMESPACES - bool "Namespaces support" if EXPERT + bool "Namespaces support" depends on MULTIUSER default !EXPERT help +@@ -1321,7 +1321,7 @@ config MEMBARRIER + If unsure, say Y. + + config CHECKPOINT_RESTORE +- bool "Checkpoint/restore support" if EXPERT ++ bool "Checkpoint/restore support" + select PROC_CHILDREN + default n + help +-- +2.14.3 + |