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.

7 files changed, 10 insertions, 88 deletions

diff --git a/config-generic b/config-generic
index 6ae1e84b3..9ae4301fb 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 566fac210..f10769f48 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 99af56915..888577342 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 f6645fe71..be41d737f 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 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
 
diff --git a/select-regmap-from-wm8400.patch b/select-regmap-from-wm8400.patch
deleted file mode 100644
index eba5b5e82..000000000
--- a/select-regmap-from-wm8400.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.220.45.11 with SMTP id c11cs78852vcf;
-        Tue, 25 Oct 2011 11:54:49 -0700 (PDT)
-Received: by 10.236.124.17 with SMTP id w17mr28007377yhh.126.1319568876490;
-        Tue, 25 Oct 2011 11:54:36 -0700 (PDT)
-Return-Path: <linux-kernel-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id d47si24837679yhn.69.2011.10.25.11.54.34;
-        Tue, 25 Oct 2011 11:54:36 -0700 (PDT)
-Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1750837Ab1JYSyG (ORCPT <rfc822;abhay.linux@gmail.com>
-	+ 99 others); Tue, 25 Oct 2011 14:54:06 -0400
-Received: from mx1.redhat.com ([209.132.183.28]:17177 "EHLO mx1.redhat.com"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1750755Ab1JYSyF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
-	Tue, 25 Oct 2011 14:54:05 -0400
-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
-	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9PIs3QL004267
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
-	Tue, 25 Oct 2011 14:54:03 -0400
-Received: from gelk.kernelslacker.org (ovpn-113-62.phx2.redhat.com [10.3.113.62])
-	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9PIs2CE024426
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
-	Tue, 25 Oct 2011 14:54:03 -0400
-Received: from gelk.kernelslacker.org (gelk [127.0.0.1])
-	by gelk.kernelslacker.org (8.14.5/8.14.4) with ESMTP id p9PIs0Ia021463;
-	Tue, 25 Oct 2011 14:54:01 -0400
-Received: (from davej@localhost)
-	by gelk.kernelslacker.org (8.14.5/8.14.5/Submit) id p9PIs0wZ021462;
-	Tue, 25 Oct 2011 14:54:00 -0400
-X-Authentication-Warning: gelk.kernelslacker.org: davej set sender to davej@redhat.com using -f
-Date:	Tue, 25 Oct 2011 14:54:00 -0400
-From:	Dave Jones <davej@redhat.com>
-To:	Mark Brown <broonie@opensource.wolfsonmicro.com>
-Cc:	Linux Kernel <linux-kernel@vger.kernel.org>
-Subject: wm8400-core: select REGMAP_I2C in kconfig
-Message-ID: <20111025185359.GA21019@redhat.com>
-Mail-Followup-To: Dave Jones <davej@redhat.com>,
-	Mark Brown <broonie@opensource.wolfsonmicro.com>,
-	Linux Kernel <linux-kernel@vger.kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.21 (2010-09-15)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-wm8400-core.c is using the regmap I2C API, so needs to select it.
-
-ERROR: "regmap_write" [drivers/mfd/wm8400-core.ko] undefined!
-ERROR: "regmap_raw_read" [drivers/mfd/wm8400-core.ko] undefined!
-ERROR: "regmap_read" [drivers/mfd/wm8400-core.ko] undefined!
-ERROR: "regmap_init_i2c" [drivers/mfd/wm8400-core.ko] undefined!
-ERROR: "regmap_bulk_read" [drivers/mfd/wm8400-core.ko] undefined!
-ERROR: "regmap_exit" [drivers/mfd/wm8400-core.ko] undefined!
-
-Signed-off-by: Dave Jones <davej@redhat.com>
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index a67adcb..67a6126 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -389,6 +389,7 @@ config MFD_MAX8998
- config MFD_WM8400
- 	tristate "Support Wolfson Microelectronics WM8400"
- 	select MFD_CORE
-+	select REGMAP_I2C
- 	depends on I2C
- 	help
- 	  Support for the Wolfson Microelecronics WM8400 PMIC and audio
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/sources b/sources
index 9944ac663..a719eb1d2 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