summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-powerpc-generic3
-rw-r--r--kernel.spec5
2 files changed, 4 insertions, 4 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index e6c2ebd6d..58c3393a2 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -357,9 +357,6 @@ CONFIG_RFKILL_GPIO=m
# CONFIG_NET_VENDOR_PASEMI is not set
# CONFIG_NET_VENDOR_TOSHIBA is not set
-# Disable btrfs until it is shown to work with 64k pages (rhbz 747079)
-# CONFIG_BTRFS_FS is not set
-#
# CONFIG_CPU_IDLE is not set
# CONFIG_OF_SELFTEST is not set
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
diff --git a/kernel.spec b/kernel.spec
index f3922ba5d..43f4a9a03 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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2323,6 +2323,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Sep 07 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc4.git2.2
+- Re-enable BTRFS on ppc. Brent Baude says it works now.
+
* Fri Sep 07 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc4.git2.1
- Linux v3.6-rc4-128-geeea3ac