diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 1 |
6 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index ed427a026..3b324dcc8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog *.rpm kernel-2.6.*/ /patch-2.6.36-rc3.bz2 +/patch-2.6.36-rc3-git1.bz2 @@ -88,6 +88,7 @@ debug: @perl -pi -e 's/# CONFIG_KDB_KEYBOARD is not set/CONFIG_KDB_KEYBOARD=y/' config-nodebug @perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug + @perl -pi -e 's/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/' config-nodebug @# just in case we're going from extremedebug -> debug @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug @@ -158,6 +159,7 @@ release: #@perl -pi -e 's/CONFIG_KGDB_KDB=y/# CONFIG_KGDB_KDB is not set/' config-nodebug #@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug @perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug + @perl -pi -e 's/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/' config-nodebug @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug diff --git a/config-debug b/config-debug index f8c7c00b1..25cbf2e48 100644 --- a/config-debug +++ b/config-debug @@ -87,5 +87,7 @@ CONFIG_PM_ADVANCED_DEBUG=y CONFIG_CEPH_FS_PRETTYDEBUG=y CONFIG_QUOTA_DEBUG=y +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set + CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y diff --git a/config-nodebug b/config-nodebug index 5c7f4364e..d5b33c674 100644 --- a/config-nodebug +++ b/config-nodebug @@ -87,5 +87,7 @@ CONFIG_PM_ADVANCED_DEBUG=y CONFIG_CEPH_FS_PRETTYDEBUG=y CONFIG_QUOTA_DEBUG=y +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set + CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y diff --git a/kernel.spec b/kernel.spec index 3aa949799..51b9b6157 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 17 +%global baserelease 18 %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 3 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1882,6 +1882,11 @@ fi # || || %changelog +* Wed Sep 08 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.18.rc3.git1 +- 2.6.36-rc3-git1 +- Set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS for nodebug, and unset for debug. + Which seems like the sensible thing to do given the Kconfig default is y. + * Tue Sep 07 2010 Dave Jones <davej@redhat.com> - Disable hung task checker, it only ever causes false positives. (#630777) @@ -1,2 +1,3 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 94696d0d72fc9a9e70dd10f40d39c573 patch-2.6.36-rc3.bz2 +517a061b696c1146038487e180204066 patch-2.6.36-rc3-git1.bz2 |