summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-11-27 14:01:21 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-11-27 14:06:45 -0500
commit0970aa2a8138400a2603f1bbfff27ced8168a984 (patch)
tree00038ddf8c4a1b2c1e81549ce79b336f34f89247 /kernel.spec
parent739840a50514d76fcb3c19732ff899b9270284a6 (diff)
downloadkernel-0970aa2a8138400a2603f1bbfff27ced8168a984.tar.gz
kernel-0970aa2a8138400a2603f1bbfff27ced8168a984.tar.xz
kernel-0970aa2a8138400a2603f1bbfff27ced8168a984.zip
Update patches for 8139cp issues from David Woodhouse (rhbz 851278)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index dfe86ab5..0155a468 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -773,6 +773,11 @@ Patch21226: vt-Drop-K_OFF-for-VC_MUTE.patch
Patch21228: exec-do-not-leave-bprm-interp-on-stack.patch
Patch21229: exec-use-eloop-for-max-recursion-depth.patch
+#rhbz 851278
+Patch21234: Revert-8139cp-revert-set-ring-address-before-enabling.patch
+Patch21232: 8139cp-set-ring-address-after-enabling-C-mode.patch
+Patch21233: 8139cp-re-enable-interrupts-after-tx-timeout.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1489,6 +1494,11 @@ ApplyPatch vt-Drop-K_OFF-for-VC_MUTE.patch
ApplyPatch exec-do-not-leave-bprm-interp-on-stack.patch
ApplyPatch exec-use-eloop-for-max-recursion-depth.patch
+#rhbz 851278
+ApplyPatch Revert-8139cp-revert-set-ring-address-before-enabling.patch
+ApplyPatch 8139cp-set-ring-address-after-enabling-C-mode.patch
+ApplyPatch 8139cp-re-enable-interrupts-after-tx-timeout.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2356,6 +2366,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Nov 27 2012 Josh Boyer <jwboyer@redhat.com>
+- Update patches for 8139cp issues from David Woodhouse (rhbz 851278)
+
* Tue Nov 27 2012 Josh Boyer <jwboyer@redhat.com> - 3.7.0-0.rc7.git1.1
- Linux v3.7-rc7-25-g2844a48
- Reenable debugging options.