summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-04 08:26:47 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-11-04 08:26:47 -0400
commit7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794 (patch)
tree31143a31cee0acbab626342497111cda4a6182c2 /kernel.spec
parentad5ad18ea224ba1d4e9765192cde8cdd8de0653a (diff)
downloadkernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.tar.gz
kernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.tar.xz
kernel-7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794.zip
Linux 3.1-git6 (upstream 1a67a573b8d)
Make CONFIG_EDAC_SBRIDGE only build on x86_64 since it has 64-bit divide errors on 32-bit kernels.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 769b76c00..43fa760c7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -691,7 +691,6 @@ Patch13003: efi-dont-map-boot-services-on-32bit.patch
Patch13009: hvcs_pi_buf_alloc.patch
Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
-Patch13014: select-regmap-from-wm8400.patch
Patch20000: utrace.patch
@@ -1321,8 +1320,6 @@ ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
# utrace.
ApplyPatch utrace.patch
-ApplyPatch select-regmap-from-wm8400.patch
-
#rhbz 750402
ApplyPatch oom-fix-integer-overflow-of-points.patch
@@ -2029,6 +2026,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Nov 04 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-git6
+
* Thu Nov 03 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-git5