diff --git a/config-sparc64-generic b/config-sparc64-generic index 9e8d54b60..5deab1fdd 100644 --- a/config-sparc64-generic +++ b/config-sparc64-generic @@ -197,5 +197,5 @@ CONFIG_CRYPTO_DEV_NIAGARA2=y # CONFIG_MMC_SDHCI_OF is not set # CONFIG_OF_SELFTEST is not set -CONFIG_BPF_JIT=m +CONFIG_BPF_JIT=y # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set diff --git a/kernel.spec b/kernel.spec index 226d22da6..7978aab1d 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 3 +%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 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2297,6 +2297,9 @@ fi # ||----w | # || || %changelog +* Tue May 22 2012 Josh Boyer - 3.5.0-0.rc0.git2.1 +- Linux v3.4-2285-g2e32180 + * Mon May 21 2012 Josh Boyer - Update the modsign patchset to the most recent version diff --git a/sources b/sources index 63ba7ba4c..0e77b1dd6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 967f72983655e2479f951195953e8480 linux-3.4.tar.xz -088d5cf54aaa8f81e1726ddf9eef2fd9 patch-3.4-git1.xz +9f7571cb02859a083e60aba67083f827 patch-3.4-git2.xz