summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-29 08:31:59 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-29 08:31:59 -0400
commitfe5d1cd9ddbfd3e99210c4951f2894693ad81b93 (patch)
tree6a3cfe5996f9bc666b1eff86bb814311ee608063 /kernel.spec
parentccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0 (diff)
downloadkernel-fe5d1cd9ddbfd3e99210c4951f2894693ad81b93.tar.gz
kernel-fe5d1cd9ddbfd3e99210c4951f2894693ad81b93.tar.xz
kernel-fe5d1cd9ddbfd3e99210c4951f2894693ad81b93.zip
Linux 3.1-rc4
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index b7f45f696..dd9581b77 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -713,7 +713,6 @@ Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
Patch12026: block-stray-block-put-after-teardown.patch
Patch12027: usb-add-quirk-for-logitech-webcams.patch
Patch12029: crypto-register-cryptd-first.patch
-Patch12030: fix-intel-duplicate-backlight.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
@@ -1316,7 +1315,6 @@ ApplyPatch block-stray-block-put-after-teardown.patch
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
ApplyPatch crypto-register-cryptd-first.patch
-ApplyPatch fix-intel-duplicate-backlight.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -2035,6 +2033,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Aug 29 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc4
+
* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
- Fix get_gate_vma usage in i386 NX emulation
- Bring back the 32bit mmap randomization patch for now.