[kernel] Linux v3.4-9547-gfb21aff

[Josh Boyer]

commit 940afcbf92efc16c6b932d35041dd8ef5251ae55
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu May 31 22:23:02 2012 -0400

    Linux v3.4-9547-gfb21aff

 config-generic         |   14 +++++++++++++-
 kernel.spec            |    7 +++++--
 modsign-20120510.patch |    2 +-
 sources                |    2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/config-generic b/config-generic
index 8569c9a..ef4e4af 100644
--- a/config-generic
+++ b/config-generic
@@ -417,6 +417,7 @@ CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DEBUG=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -3630,6 +3631,17 @@ CONFIG_NLS_ISO8859_14=m
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_CODEPAGE_MACROMAN=m
+CONFIG_NLS_CODEPAGE_MACCELTIC=m
+CONFIG_NLS_CODEPAGE_MACCENTEURO=m
+CONFIG_NLS_CODEPAGE_MACCROATIAN=m
+CONFIG_NLS_CODEPAGE_MACCYRILLIC=m
+CONFIG_NLS_CODEPAGE_MACGAELIC=m
+CONFIG_NLS_CODEPAGE_MACGREEK=m
+CONFIG_NLS_CODEPAGE_MACICELAND=m
+CONFIG_NLS_CODEPAGE_MACINUIT=m
+CONFIG_NLS_CODEPAGE_MACROMANIAN=m
+CONFIG_NLS_CODEPAGE_MACTURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS_ASCII=y
 
@@ -4041,7 +4053,7 @@ CONFIG_CFAG12864B_RATE=20
 
 # CONFIG_PHANTOM is not set
 
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 
 # CONFIG_TEST_POWER is not set
diff --git a/kernel.spec b/kernel.spec
index 8fd9db7..3bca696 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 3
+%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 10
+%define gitrev 11
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2296,6 +2296,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jun 01 2012 Josh Boyer <jwboyer at redhat.com> - 3.5.0-0.rc0.git11.1
+- Linux v3.4-9547-gfb21aff
+
 * Thu May 31 2012 Josh Boyer <jwboyer at redhat.com>
 - Per Adam Jackson, drop linux-2.6-intel-iommu-igfx.patch
 
diff --git a/modsign-20120510.patch b/modsign-20120510.patch
index e323a99..8f2a8e8 100644
--- a/modsign-20120510.patch
+++ b/modsign-20120510.patch
@@ -4133,7 +4133,7 @@ index 1cc1c5a..b64dab0 100644
 @@ -29,14 +29,17 @@ struct mod_arch_specific
  };
  
- #ifdef __s390x__
+ #ifdef CONFIG_64BIT
 +#define MODULES_ARE_ELF64
  #define ElfW(x) Elf64_ ## x
  #define ELFW(x) ELF64_ ## x
diff --git a/sources b/sources
index 18b7884..08446e6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 967f72983655e2479f951195953e8480  linux-3.4.tar.xz
-11275fd70893f1a51c1fca34601eadbd  patch-3.4-git10.xz
+33effd70d1ca8908f1473c3640b5c61b  patch-3.4-git11.xz