diff options
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/config-x86-generic b/config-x86-generic index f45da91dd..d6feae847 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -534,7 +534,7 @@ CONFIG_JUMP_LABEL=y CONFIG_X86_32_IRIS=m -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CRYPTO_AES_NI_INTEL=m diff --git a/kernel.spec b/kernel.spec index 7a5192cdb..9d2452fe6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1955,6 +1955,10 @@ fi # ||----w | # || || %changelog +* Wed Jan 26 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git5.1 +- Linux 2.6.38-rc2-git5 +- [x86] Re-enable TRANSPARENT_HUGEPAGE, should be fixed by cacf061c. + * Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.2 - [x86] Disable TRANSPARENT_HUGEPAGE for now, there be dragons there. @@ -1,4 +1,3 @@ c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2 4651b1512e2fba1735713aca8f1007fc patch-2.6.38-rc2.bz2 -1edbfed39a74c24b542747f2b97f1e32 patch-2.6.38-rc2-git1.bz2 -a1dc409bd56ddcac0408136e5ba3eb9c patch-2.6.38-rc2-git3.bz2 +edd237634aa10e32f8f555e22927594f patch-2.6.38-rc2-git5.bz2 |