summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-26 11:04:13 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-26 11:04:23 -0500
commit15133d7ec35e6b68c2e4edb29e37d39872a86e2b (patch)
treec063aeed71177374ce1bf408313b1edb933bbad6 /kernel.spec
parent9a6c2dc6e914791e4f90fd2724fc99c68f497c9a (diff)
downloadkernel-15133d7ec35e6b68c2e4edb29e37d39872a86e2b.tar.gz
kernel-15133d7ec35e6b68c2e4edb29e37d39872a86e2b.tar.xz
kernel-15133d7ec35e6b68c2e4edb29e37d39872a86e2b.zip
Add patch from Linus Torvalds to fix 32-bit autofs4 build
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index a1a03ca30..9ff33731b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -774,6 +774,8 @@ Patch21270: s390x-enable-keys-compat.patch
#rhbz 795544
Patch21280: ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
+Patch21291: fix-autofs4-build.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1493,6 +1495,8 @@ ApplyPatch s390x-enable-keys-compat.patch
#rhbz 795544
ApplyPatch ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
+ApplyPatch fix-autofs4-build.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2364,6 +2368,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Feb 26 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc5.git0.3
+- Add patch from Linus Torvalds to fix 32-bit autofs4 build
+
* Sat Feb 25 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc5.git0.2
- Disable debugging options.