diff --git a/.gitignore b/.gitignore index e05d771aa..060e66e03 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog *.rpm kernel-2.6.*/ /patch-2.6.36-rc6.bz2 +/patch-2.6.36-rc6-git2.bz2 diff --git a/kernel.spec b/kernel.spec index 08c29b842..a39daeb7c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 30 +%global baserelease 31 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1944,6 +1944,9 @@ fi # || || %changelog +* Sat Oct 02 2010 Kyle McMartin 2.6.36-0.31.rc6.git2 +- Linux 2.6.36-rc6-git2 + * Thu Sep 30 2010 Dave Jones - silence another rcu_reference warning diff --git a/sources b/sources index 8ca91d0b7..46613363a 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 df4f4d64d812b6eea0079acb62e8ca83 patch-2.6.36-rc6.bz2 +528777aa72e516033deb1dc4c005650f patch-2.6.36-rc6-git2.bz2