summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-19 09:30:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-19 09:30:34 -0400
commit7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9 (patch)
tree4b73c74ef34c653c848e153f453ce46e68926498 /kernel.spec
parentc3c2b77d29fe2057cb4647f2810b6415ff55fadb (diff)
downloadkernel-7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9.tar.gz
kernel-7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9.tar.xz
kernel-7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9.zip
Fix 64-bit divide error in btrfs
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 873c15f3a..4d4ed2645 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 0
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -720,6 +720,7 @@ 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
+Patch12030: btrfs-use-do_div.patch
# Runtime power management
@@ -1347,6 +1348,7 @@ ApplyPatch usb-add-quirk-for-logitech-webcams.patch
ApplyPatch fix-perf-build.patch
ApplyPatch crypto-register-cryptd-first.patch
+ApplyPatch btrfs-use-do_div.patch
# Runtime PM
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
@@ -2073,6 +2075,9 @@ fi
# || ||
%changelog
* Fri Aug 19 2011 Josh Boyer <jwboyer@redhat.com>
+- Add patch from upstream to fix 64-bit divide error in btrfs
+
+* 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)