Linux v3.6-rc1-355-gddf343f
This commit is contained in:
parent
83eda0f218
commit
2b2f139262
11
kernel.spec
11
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)
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user