summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-09-05 08:24:45 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-09-05 08:24:53 -0400
commit4755af6ee497e2034540cde0798f7325ed3935f7 (patch)
tree82534b2b65275426ed1c502878603f7367637eb6 /kernel.spec
parent221b79a9ac885a40f42e9bd9ef786a7ba53a2d64 (diff)
downloadkernel-4755af6ee497e2034540cde0798f7325ed3935f7.tar.gz
kernel-4755af6ee497e2034540cde0798f7325ed3935f7.tar.xz
kernel-4755af6ee497e2034540cde0798f7325ed3935f7.zip
Linux v3.6-rc4-53-g5b716ac
- Add patch to fix ibmveth issue from Santiago Leon (rhbz 852842)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec14
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index a157e0ea4..b70854f54 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 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -756,6 +756,9 @@ Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch
#rhbz 846037
Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
+#rhbz 852842
+Patch22068: ibmveth-Fix-alignment-of-rx-queue-bug.patch
+
Patch30000: 0001-ALSA-snd-usb-Fix-URB-cancellation-at-stream-start.patch
# END OF PATCH DEFINITIONS
@@ -1457,6 +1460,9 @@ ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch
#rhbz 846037
ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
+#rhbz 852842
+ApplyPatch ibmveth-Fix-alignment-of-rx-queue-bug.patch
+
ApplyPatch 0001-ALSA-snd-usb-Fix-URB-cancellation-at-stream-start.patch
# END OF PATCH APPLICATIONS
@@ -2321,6 +2327,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Sep 05 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc4.git1.1
+- Linux v3.6-rc4-53-g5b716ac
+- Add patch to fix ibmveth issue from Santiago Leon (rhbz 852842)
+
* Wed Sep 05 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc4.git0.2
- Reenable debugging options.