From f39ad019437fa300f5d2e05ee89154825cae737c Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 6 Feb 2013 11:44:09 -0500 Subject: [PATCH] Enable CONFIG_NAMESPACES everywhere (rhbz 907576) So apparently we've been enabling CONFIG_NAMESPACES in Fedora kernels for a very long time even though it was never explicitly set. The kconfig entry for it looks like it should depend on CONFIG_EXPERT (which isn't set), but either the fact that we've had CONFIG_NET_NS, etc enabled explicitly or the fact that it defaults to !EXPERT seems to do something weird with menuconfig and enables it in the final config. Whatever, just turn it back on. It seems to break rtkit-daemon for some reason. --- config-generic | 2 +- config-x86_64-generic | 1 - kernel.spec | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-generic b/config-generic index fb1d92b56..200995146 100644 --- a/config-generic +++ b/config-generic @@ -55,7 +55,7 @@ CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_DEFAULT_CFQ=y # CONFIG_CHECKPOINT_RESTORE is not set -# CONFIG_NAMESPACES is not set +CONFIG_NAMESPACES=y CONFIG_PID_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y diff --git a/config-x86_64-generic b/config-x86_64-generic index 575564345..54403ba68 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -129,7 +129,6 @@ CONFIG_BPF_JIT=y # https://fedoraproject.org/wiki/Features/Checkpoint_Restore CONFIG_CHECKPOINT_RESTORE=y -CONFIG_NAMESPACES=y # Should be 32bit only, but lacks KConfig depends # CONFIG_XO15_EBOOK is not set diff --git a/kernel.spec b/kernel.spec index 830244807..adbdbbb96 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2321,7 +2321,8 @@ fi # ||----w | # || || %changelog -* Wed Feb 06 2013 Josh Boyer +* Wed Feb 06 2013 Josh Boyer - 3.8.0-0.rc6.git3.3 +- Enable CONFIG_NAMESPACES everywhere (rhbz 907576) - Add patch to fix ath9k dma stop checks (rhbz 892811) * Wed Feb 06 2013 Josh Boyer - 3.8.0-0.rc6.git3.1