diff options
| author | Drtan Samos <lashdu@drtan.twilightparadox.com> | 2014-03-03 18:49:15 +0100 |
|---|---|---|
| committer | Drtan Samos <lashdu@drtan.twilightparadox.com> | 2014-03-03 18:49:15 +0100 |
| commit | 926e54e67433d33d75b19b21544c5b8303389aa0 (patch) | |
| tree | 6177f2e93611ffba8ef822da12850bf3565d7766 /kernels/linux-libre-knock/criu-no-expert.patch | |
| parent | c850156e865805296b73eee01caa4b4469191437 (diff) | |
| parent | 535ef7c5859bc88ca3a0d382261632ec8d8df066 (diff) | |
| download | abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.tar.gz abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.tar.bz2 abslibre-926e54e67433d33d75b19b21544c5b8303389aa0.zip | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-knock/criu-no-expert.patch')
| -rw-r--r-- | kernels/linux-libre-knock/criu-no-expert.patch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kernels/linux-libre-knock/criu-no-expert.patch b/kernels/linux-libre-knock/criu-no-expert.patch index 9bbc02812..2124427e9 100644 --- a/kernels/linux-libre-knock/criu-no-expert.patch +++ b/kernels/linux-libre-knock/criu-no-expert.patch @@ -1,8 +1,8 @@ diff --git a/init/Kconfig b/init/Kconfig -index 4e5d96a..4b94ffe 100644 +index be8b7f5..7461760 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP +@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -11,3 +11,12 @@ index 4e5d96a..4b94ffe 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. +@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE + If unsure, say N here. + + menuconfig NAMESPACES +- bool "Namespaces support" if EXPERT ++ bool "Namespaces support" + default !EXPERT + help + Provides the way to make tasks work with different objects using |