[kernel] Linux v3.4-5161-g56edab3

Josh Boyer jwboyer at fedoraproject.org
Wed May 23 19:57:09 UTC 2012


commit afabfc9465b4fd904440754d6b40b26d2b003135
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed May 23 15:57:04 2012 -0400

    Linux v3.4-5161-g56edab3

 config-generic                          |    1 +
 config-powerpc64                        |    7 ++
 config-x86-32-generic                   |    1 +
 kernel.spec                             |    9 +-
 perf-Fix-trace-event-perl.c-build.patch |  172 -------------------------------
 sources                                 |    3 +-
 6 files changed, 14 insertions(+), 179 deletions(-)
---
diff --git a/config-generic b/config-generic
index 0fcce30..00e4489 100644
--- a/config-generic
+++ b/config-generic
@@ -3791,6 +3791,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_HEADERS_CHECK=y
 # CONFIG_LKDTM is not set
+# CONFIG_READABLE_ASM is not set
 
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_LOCKDEP is not set
diff --git a/config-powerpc64 b/config-powerpc64
index f94a975..5cdc51e 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -1,6 +1,9 @@
 CONFIG_WINDFARM_PM81=y
 CONFIG_WINDFARM_PM91=y
 CONFIG_WINDFARM_PM121=y
+CONFIG_WINDFARM_PM72=y
+CONFIG_WINDFARM_RM31=y
+
 CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
 # CONFIG_PPC_CELL is not set
@@ -162,6 +165,10 @@ CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
+# CONFIG_HW_RANDOM_PSERIES is not set
+# CONFIG_CRYPTO_DEV_NX is not set
+
+
 CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index abf9731..7625c2f 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -27,6 +27,7 @@ CONFIG_M686=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_STA2X11 is not set
 
 CONFIG_NR_CPUS=32
 CONFIG_X86_GENERIC=y
diff --git a/kernel.spec b/kernel.spec
index 94fbeb1..c5d413e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 4
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -748,8 +748,6 @@ Patch21400: unhandled-irqs-switch-to-polling.patch
 
 Patch21620: vgaarb-vga_default_device.patch
 
-Patch21621: perf-Fix-trace-event-perl.c-build.patch
-
 Patch22000: weird-root-dentry-name-debug.patch
 
 #selinux ptrace child permissions
@@ -1453,8 +1451,6 @@ ApplyPatch highbank-export-clock-functions.patch
 #vgaarb patches.  blame mjg59
 ApplyPatch vgaarb-vga_default_device.patch
 
-ApplyPatch perf-Fix-trace-event-perl.c-build.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2305,6 +2301,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed May 23 2012 Josh Boyer <jwboyer at redhat.com> - 3.5.0-0.rc0.git5.1
+- Linux v3.4-5161-g56edab3
+
 * Wed May 23 2012 Adam Jackson <ajax at redhat.com>
 - drm-i915-lvds-dual-channel.patch: Scrape LVDS dual-channel-ness from the
   VBT instead of just making things up. (#819343)
diff --git a/sources b/sources
index f81fbe4..afb8598 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 967f72983655e2479f951195953e8480  linux-3.4.tar.xz
-3e062ae5dd4d742e7ce210fc100a10a4  patch-3.4-git3.xz
-ba6e83cbd1c54910005dcf3e8074bfa9  patch-3.4-git4.xz
+a18e8a7208d4f3d004c6e792e3c1c49a  patch-3.4-git5.xz


More information about the scm-commits mailing list