summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-22 17:15:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-22 17:15:34 -0400
commitd20ff5e932dccbeac28c81b9b70a842b8fa60a9f (patch)
treec109e761d45fc7a60491001b5293c7e8356ee354 /kernel.spec
parent0b3ccf1fa57692b745503d53b8f7712250ecfb51 (diff)
downloadkernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.tar.gz
kernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.tar.xz
kernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.zip
3.1-rc3.
Add patch to fix duplicate backlight registration on i915
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 8edae8dc0..4c3919731 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 2
+%define rcrev 3
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -717,8 +717,8 @@ Patch12024: epoll-fix-spurious-lockdep-warnings.patch
Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
Patch12026: block-stray-block-put-after-teardown.patch
Patch12027: usb-add-quirk-for-logitech-webcams.patch
-Patch12028: fix-perf-build.patch
Patch12029: crypto-register-cryptd-first.patch
+Patch12030: fix-intel-duplicate-backlight.patch
# Runtime power management
@@ -1345,8 +1345,8 @@ ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
ApplyPatch block-stray-block-put-after-teardown.patch
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
-ApplyPatch fix-perf-build.patch
ApplyPatch crypto-register-cryptd-first.patch
+ApplyPatch fix-intel-duplicate-backlight.patch
# Runtime PM
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
@@ -2073,6 +2073,10 @@ fi
# || ||
%changelog
* Mon Aug 22 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc3
+- Add patch to fix duplicate backlight registration (rhbz 732202)
+
+* Mon Aug 22 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc2-git9
* Sat Aug 20 2011 Josh Boyer <jwboyer@redhat.com>