summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-06 11:44:09 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-06 11:49:05 -0500
commitf39ad019437fa300f5d2e05ee89154825cae737c (patch)
treefc554dc9e8d3cbcd113fd0a35aa545d1a5d76db8
parent27e48a69995096472390d6e9a87d58502c88e47f (diff)
downloadkernel-f39ad019437fa300f5d2e05ee89154825cae737c.tar.gz
kernel-f39ad019437fa300f5d2e05ee89154825cae737c.tar.xz
kernel-f39ad019437fa300f5d2e05ee89154825cae737c.zip
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.
-rw-r--r--config-generic2
-rw-r--r--config-x86_64-generic1
-rw-r--r--kernel.spec5
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 <jwboyer@redhat.com>
+* Wed Feb 06 2013 Josh Boyer <jwboyer@redhat.com> - 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 <jwboyer@redhat.com> - 3.8.0-0.rc6.git3.1