Linux v3.4-5722-gf936991

5 files changed, 11 insertions, 36 deletions

diff --git a/config-generic b/config-generic
index 00e4489ee..c98215661 100644
--- a/config-generic
+++ b/config-generic
@@ -2246,6 +2246,7 @@ CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_EMC1403=m
@@ -4044,6 +4045,8 @@ CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -4467,6 +4470,7 @@ CONFIG_TEST_KSTRTOX=y
 CONFIG_TARGET_CORE=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_LOOPBACK_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
diff --git a/config-x86-generic b/config-x86-generic
index 22a35daab..b706ab710 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -224,6 +224,7 @@ CONFIG_XO15_EBOOK=m
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
 CONFIG_VIA_WDT=m
+CONFIG_IE6XX_WDT=m
 
 CONFIG_CRASH_DUMP=y
 CONFIG_PROC_VMCORE=y
diff --git a/kernel.spec b/kernel.spec
index 0a91e020e..9bfe5e356 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 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2307,6 +2307,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu May 24 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git6.1
+- Linux v3.4-5722-gf936991
+
 * Thu May 24 2012 Josh Boyer <jwboyer@redhat.com>
 - CVE-2012-2372 mm: 32bit PAE pmd walk vs populate SMP race (rhbz 822821 822825)
 
diff --git a/modsign-20120510.patch b/modsign-20120510.patch
index ee67a2a62..e323a99a3 100644
--- a/modsign-20120510.patch
+++ b/modsign-20120510.patch
@@ -3872,39 +3872,6 @@ index 278e3ef..949d494 100644
 1.7.10.2
 
 
-From b37a512b3d6593d541e05550316bd407515c1ec2 Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Thu, 10 May 2012 23:49:44 +0100
-Subject: [PATCH 18/36] Guard check in module loader against integer overflow
-
-The check:
-
-	if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr))
-
-may not work if there's an overflow in the right-hand side of the condition.
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- kernel/module.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 78ac6ec..377cb06 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2429,7 +2429,8 @@ static int copy_and_check(struct load_info *info,
- 		goto free_hdr;
- 	}
- 
--	if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr)) {
-+	if (hdr->e_shoff >= len ||
-+	    hdr->e_shnum * sizeof(Elf_Shdr) > len - hdr->e_shoff) {
- 		err = -ENOEXEC;
- 		goto free_hdr;
- 	}
--- 
-1.7.10.2
-
 
 From a7f2ec2a77490ed84bf8020cd5b41d7c7ea3f3cb Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
diff --git a/sources b/sources
index afb85981c..4dc1a3270 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 967f72983655e2479f951195953e8480  linux-3.4.tar.xz
-a18e8a7208d4f3d004c6e792e3c1c49a  patch-3.4-git5.xz
+657853733d14a957379f1bf15f454b75  patch-3.4-git6.xz