summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-09-02 05:51:15 -0400
committerChuck Ebbert <cebbert@redhat.com>2010-09-02 05:51:15 -0400
commit3285fcda470ebafa7879262794129c9c7ed15a08 (patch)
tree92b0842ce0556e10b68358c162e915ab05d02697 /kernel.spec
parent3de7ad47f321d24e60efaebe1674ac57e363faed (diff)
downloadkernel-3285fcda470ebafa7879262794129c9c7ed15a08.tar.gz
kernel-3285fcda470ebafa7879262794129c9c7ed15a08.tar.xz
kernel-3285fcda470ebafa7879262794129c9c7ed15a08.zip
Add patch from ALSA mailing list to try to fix bug #628404
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index e6eb8261a..a99309db0 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 14
+%global baserelease 15
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -683,8 +683,6 @@ Patch2917: hdpvr-ir-enable.patch
# NFSv4
-# VIA Nano / VX8xx updates
-
# patches headed upstream
Patch12016: disable-i8042-check-on-apple-mac.patch
@@ -693,6 +691,8 @@ Patch12017: prevent-runtime-conntrack-changes.patch
Patch12018: neuter_intel_microcode_load.patch
+Patch12020: alsa-fix-substream-proc-status-read.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1185,6 +1185,8 @@ ApplyPatch linux-2.6-defaults-aspm.patch
# ALSA
ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
+# patch from alsa list to try to fix bug #628404
+ApplyPatch alsa-fix-substream-proc-status-read.patch
# Networking
@@ -1869,6 +1871,9 @@ fi
# || ||
%changelog
+* Thu Sep 02 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.15.rc3.git0
+- Add patch from ALSA mailing list to try to fix bug #628404
+
* Wed Sep 01 2010 Kyle McMartin <kyle@redhat.com> - 2.6.36-0.14.rc3.git0
- Fix icebp breakpoints, patch from Frederic Weisbecker.
(https://bugzilla.kernel.org/show_bug.cgi?id=16315#c26)