diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-19 08:32:04 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-19 08:32:04 -0400 |
| commit | c3c2b77d29fe2057cb4647f2810b6415ff55fadb (patch) | |
| tree | 0e670b7f53fedfda92998b01e5eb30c4636c0704 /kernel.spec | |
| parent | 02587b4efa279dbcc9d7f80fd7636074bb905012 (diff) | |
| download | kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.gz kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.xz kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.zip | |
3.1-rc2-git5 snapshot
Make XHCI builtin, add a patch to fix a race in the crypto framework
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index c2ca4b9c3..873c15f3a 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 3 +%global baserelease 0 %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 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -719,6 +719,7 @@ Patch12025: rcu-avoid-just-onlined-cpu-resched.patch Patch12026: block-stray-block-put-after-teardown.patch Patch12027: usb-add-quirk-for-logitech-webcams.patch Patch12028: fix-perf-build.patch +Patch12029: crypto-register-cryptd-first.patch # Runtime power management @@ -1345,6 +1346,7 @@ ApplyPatch block-stray-block-put-after-teardown.patch ApplyPatch usb-add-quirk-for-logitech-webcams.patch ApplyPatch fix-perf-build.patch +ApplyPatch crypto-register-cryptd-first.patch # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch @@ -2070,6 +2072,11 @@ fi # ||----w | # || || %changelog +* Fri Aug 19 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.1-rc2-git5 +- Change XHCI to builtin (rhbz 731706) +- Add patch to fix race between cryptd and aesni (rhbz 721002) + * Thu Aug 18 2011 Josh Boyer <jwboyer@redhat.com> - Adjust provides/obsoletes to replace the cpupowerutils package |