summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-07-30 10:03:04 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-07-30 10:03:04 -0400
commit3e0c7b8669887638b6045d187c7968ce8b74f700 (patch)
tree820b2e868648400d4062727fa30fd1aa9b2b92e9
parentaf258da073d70ddb69fcaf62b667c40ee70950e3 (diff)
downloadkernel-3e0c7b8669887638b6045d187c7968ce8b74f700.tar.gz
kernel-3e0c7b8669887638b6045d187c7968ce8b74f700.tar.xz
kernel-3e0c7b8669887638b6045d187c7968ce8b74f700.zip
Linux v3.5-7078-gf7da9cd
-rw-r--r--kernel.spec7
-rw-r--r--modsign-20120724.patch10
-rw-r--r--sources2
3 files changed, 11 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index b83118c81..fc2977d56 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 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2284,6 +2284,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jul 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc0.git4.1
+- Linux v3.5-7078-gf7da9cd
+
* Mon Jul 30 2012 Josh Boyer <jwboyer@redhat.com>
- Fixup patches
diff --git a/modsign-20120724.patch b/modsign-20120724.patch
index d37497d69..8432c6e50 100644
--- a/modsign-20120724.patch
+++ b/modsign-20120724.patch
@@ -4451,13 +4451,13 @@ index 7b63743..9cd13b5 100644
#ifdef MODULE
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index c7e6d20..5fc742e 100644
+index fbdd853..8d1dfde 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -45,6 +45,8 @@ config ARM
- select GENERIC_SMP_IDLE_THREAD
- select KTIME_SCALAR
- select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+@@ -48,6 +48,8 @@ config ARM
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
+ select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
+ select MODULES_USE_ELF_REL
help
diff --git a/sources b/sources
index 8caa641f7..2094829df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz
-5a3fcffccce67a523085fd09dd0f6c11 patch-3.5-git3.xz
+02364483654ba4bcf49dd444a89223ad patch-3.5-git4.xz