diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-10-22 12:24:02 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-10-22 12:24:02 -0400 |
| commit | c22cea221f8de78ab36ce0f183b73c99031cc7dc (patch) | |
| tree | 03d0921c8157e6a2e2dd113cfb3be75ccd1a9aaa /kernel.spec | |
| parent | a791768570bae98c698d212d363f6c36ac5d42e5 (diff) | |
| download | kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.gz kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.tar.xz kernel-c22cea221f8de78ab36ce0f183b73c99031cc7dc.zip | |
start following git head again
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 3cfabdc10..758ae5248 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 # Save original buildid for later if it's defined %if 0%{?buildid:1} @@ -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 8 +%define rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -680,8 +680,6 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch #Patch2916: lirc-staging-2.6.36-fixes.patch Patch2917: hdpvr-ir-enable.patch -Patch3000: linux-2.6-rcu-sched-warning.patch - # fs fixes # NFSv4 @@ -1298,9 +1296,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending) ApplyPatch hdpvr-ir-enable.patch -# silence another rcu_reference warning -ApplyPatch linux-2.6-rcu-sched-warning.patch - # Patches headed upstream ApplyPatch disable-i8042-check-on-apple-mac.patch @@ -1952,6 +1947,10 @@ fi # || || %changelog +* Fri Oct 22 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc0.git2 +- Switch to tracking git snapshots of what will become 2.6.37. +- Fix context rejects in utrace and a few other patches. + * Wed Oct 20 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36-1 - Linux 2.6.36 |