[kernel] Linux 3.1-git6 (upstream 1a67a573b8d)

[Josh Boyer]

commit 7b0cc2278dffcf7a403d3dfa30c33dba0b3d7794
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Nov 4 08:26:47 2011 -0400

    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.

 config-generic                  |    4 +-
 config-x86-32-generic           |    1 +
 config-x86-generic              |    1 -
 config-x86_64-generic           |    1 +
 kernel.spec                     |    8 ++--
 select-regmap-from-wm8400.patch |   81 ---------------------------------------
 sources                         |    2 +-
 7 files changed, 10 insertions(+), 88 deletions(-)
---
diff --git a/config-generic b/config-generic
index 6ae1e84..9ae4301 100644
--- a/config-generic
+++ b/config-generic
@@ -1370,13 +1370,15 @@ CONFIG_8139TOO=m
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
-CONFIG_SC92031=m
 
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 566fac2..f10769f 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -203,3 +203,4 @@ CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
 
+# CONFIG_EDAC_SBRIDGE is not set
diff --git a/config-x86-generic b/config-x86-generic
index 99af569..8885773 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -164,7 +164,6 @@ CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_SBRIDGE=m
 
 CONFIG_SCHED_MC=y
 
diff --git a/config-x86_64-generic b/config-x86_64-generic
index f6645fe..be41d73 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -56,6 +56,7 @@ CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_SBRIDGE=m
 
 # CONFIG_PC8736x_GPIO is not set
 
diff --git a/kernel.spec b/kernel.spec
index 769b76c..43fa760 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 at redhat.com>
+- Linux 3.1-git6
+
 * Thu Nov 03 2011 Josh Boyer <jwboyer at redhat.com>
 - Linux 3.1-git5
 
diff --git a/sources b/sources
index 9944ac6..a719eb1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
-b98c65cd86830fbc8f1e826c1a7b57fa  patch-3.1-git5.bz2
+bd969a127cd8deb8eb4b94b9f5141c75  patch-3.1-git6.bz2