diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-08-14 07:58:29 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-08-14 07:58:29 -0400 |
| commit | 2b2f1392623cfb1cebe360b60f6c4c5df03992cc (patch) | |
| tree | 29a64f0e41c9caa2a915050e5cfc0415cc4492f8 | |
| parent | 83eda0f21874f6ae7aa6a4bc80b3aede6245e17d (diff) | |
| download | kernel-2b2f1392623cfb1cebe360b60f6c4c5df03992cc.tar.gz kernel-2b2f1392623cfb1cebe360b60f6c4c5df03992cc.tar.xz kernel-2b2f1392623cfb1cebe360b60f6c4c5df03992cc.zip | |
Linux v3.6-rc1-355-gddf343f
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | modsign-20120814.patch (renamed from modsign-20120802.patch) | 6 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index d3c0add8..cd8aba24 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 2 +%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 1 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -677,7 +677,7 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch Patch800: linux-2.6-crash-driver.patch # crypto/ -Patch900: modsign-20120802.patch +Patch900: modsign-20120814.patch # secure boot Patch1000: secure-boot-20120809.patch @@ -1381,7 +1381,7 @@ ApplyPatch linux-2.6-crash-driver.patch ApplyPatch linux-2.6-e1000-ich9-montevina.patch # crypto/ -ApplyPatch modsign-20120802.patch +ApplyPatch modsign-20120814.patch # secure boot ApplyPatch secure-boot-20120809.patch @@ -2299,6 +2299,9 @@ fi # ||----w | # || || %changelog +* Tue Aug 14 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git6.1 +- Linux v3.6-rc1-355-gddf343f + * Mon Aug 13 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git5.2 - Fix VFS file creation bugs (rhbz 844485) diff --git a/modsign-20120802.patch b/modsign-20120814.patch index eb45d47a..deb6ccb9 100644 --- a/modsign-20120802.patch +++ b/modsign-20120814.patch @@ -5040,13 +5040,13 @@ index 0192a4e..c1df590 100644 asm(".section .plt,\"ax\",@nobits; .align 3; .previous"); asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous"); diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig -index 76de6b6..53a8e01 100644 +index 107610e..c76a052 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig -@@ -124,6 +124,8 @@ config S390 - select GENERIC_TIME_VSYSCALL +@@ -125,6 +125,8 @@ config S390 select GENERIC_CLOCKEVENTS select KTIME_SCALAR if 32BIT + select HAVE_ARCH_SECCOMP_FILTER + select HAVE_MOD_ARCH_SPECIFIC + select MODULES_USE_ELF_RELA @@ -1,3 +1,3 @@ 24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz af201f38b03587c3b33415fdbaf446ef patch-3.6-rc1.xz -4def4d2cf75dbdba9a0976a5514c796f patch-3.6-rc1-git5.xz +69af00455bd184779d3a01afb18e4d97 patch-3.6-rc1-git6.xz |