diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2010-08-20 23:51:22 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2010-08-20 23:51:22 -0400 |
| commit | 4b4acded4de82ec0085ef2279112e9913bb85bc7 (patch) | |
| tree | c88c6e8807962c6cc2b86ce71567007ccafe86c3 /kernel.spec | |
| parent | a62b0aa064c2e60aa1b2d4cbc03a6e260c2c5b88 (diff) | |
| download | kernel-4b4acded4de82ec0085ef2279112e9913bb85bc7.tar.gz kernel-4b4acded4de82ec0085ef2279112e9913bb85bc7.tar.xz kernel-4b4acded4de82ec0085ef2279112e9913bb85bc7.zip | |
Linux 2.6.36-rc1-git3
Drop x86-cpu-fix-regression-in-amd-errata-checking-code.patch, now merged.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 0499699b8..6bf22ede7 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 4 +%global baserelease 5 %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 1 # The git snapshot level -%define gitrev 1 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -688,8 +688,6 @@ Patch12017: prevent-runtime-conntrack-changes.patch Patch12018: neuter_intel_microcode_load.patch -Patch12019: x86-cpu-fix-regression-in-amd-errata-checking-code.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1256,8 +1254,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch neuter_intel_microcode_load.patch -ApplyPatch x86-cpu-fix-regression-in-amd-errata-checking-code.patch - # END OF PATCH APPLICATIONS %endif @@ -1865,6 +1861,10 @@ fi # || || %changelog +* Fri Aug 20 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.5.rc1.git3 +- Linux 2.6.36-rc1-git3 +- Drop x86-cpu-fix-regression-in-amd-errata-checking-code.patch, now merged. + * Thu Aug 19 2010 Kyle McMartin <kmcmartin@redhat.com> - 2.6.36-0.4.rc1.git1 - Run oldnoconfig on the configs during make prep. - Make the fix oldnoconfig patch a one liner. |