diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
| commit | 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch) | |
| tree | 757e53f443e27a95d1b1b0cdf337c2147953fc46 /libre/linux-libre/criu-no-expert.patch | |
| parent | eadbb9961b89668e4aed317f5dd97cb04e86663e (diff) | |
| parent | 1d20e4962664ab152948a14b4320b12204a1053e (diff) | |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/libftdi/PKGBUILD
community/lxshortcut/PKGBUILD
community/pcmanfm/PKGBUILD
community/qingy/PKGBUILD
community/yagf/PKGBUILD
extra/ethtool/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/postgresql/PKGBUILD
extra/xfburn/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'libre/linux-libre/criu-no-expert.patch')
| -rw-r--r-- | libre/linux-libre/criu-no-expert.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libre/linux-libre/criu-no-expert.patch b/libre/linux-libre/criu-no-expert.patch index 2124427e9..9bbc02812 100644 --- a/libre/linux-libre/criu-no-expert.patch +++ b/libre/linux-libre/criu-no-expert.patch @@ -1,8 +1,8 @@ diff --git a/init/Kconfig b/init/Kconfig -index be8b7f5..7461760 100644 +index 4e5d96a..4b94ffe 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP +@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -11,12 +11,3 @@ index be8b7f5..7461760 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 |