[kernel] Linux v3.14-5146-g0f1b1e6d73cb

[Josh Boyer]

commit 5ff84c8066e0676b69f2588d120cd32e553446bf
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Apr 2 20:57:21 2014 -0400

    Linux v3.14-5146-g0f1b1e6d73cb

 arm64-Fix-duplicated-Kconfig-entries-again.patch |   34 ----------------------
 config-generic                                   |    1 +
 config-powerpc64                                 |    2 +
 config-powerpc64p7                               |    2 +
 kernel.spec                                      |    9 +++--
 sources                                          |    2 +-
 6 files changed, 11 insertions(+), 39 deletions(-)
---
diff --git a/config-generic b/config-generic
index 7dca105..967e776 100644
--- a/config-generic
+++ b/config-generic
@@ -3613,6 +3613,7 @@ CONFIG_HID_TIVO=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
 CONFIG_HID_APPLEIR=m
+# CONFIG_HID_CP2112 is not set
 
 
 #
diff --git a/config-powerpc64 b/config-powerpc64
index 4b8ba84..e5d6d8b 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -14,6 +14,7 @@ CONFIG_PPC_PMAC=y
 CONFIG_PPC_POWERNV=y
 CONFIG_POWERNV_MSI=y
 CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_SENSORS_IBMPOWERNV=y
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_SCOM_DEBUGFS=y
 # CONFIG_PPC_PASEMI is not set
@@ -154,6 +155,7 @@ CONFIG_KVM_XICS=y
 #-- active memory sharing
 CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
 #-- DLPAR memory remove
 CONFIG_SPARSEMEM_VMEMMAP=y
 
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 4fe09ee..8981119 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -11,6 +11,7 @@ CONFIG_PPC_POWERNV=y
 CONFIG_POWERNV_MSI=y
 CONFIG_PPC_POWERNV_RTAS=y
 CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_SENSORS_IBMPOWERNV=y
 CONFIG_SCOM_DEBUGFS=y
 # CONFIG_PPC_PASEMI is not set
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
@@ -145,6 +146,7 @@ CONFIG_KVM_XICS=y
 #-- active memory sharing
 CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
 #-- DLPAR memory remove
 CONFIG_SPARSEMEM_VMEMMAP=y
 
diff --git a/kernel.spec b/kernel.spec
index 27130c0..79138c5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -433,7 +433,7 @@ BuildRequires: net-tools, hostname, bc
 BuildRequires: sparse
 %endif
 %if %{with_perf}
-BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex
+BuildRequires: elfutils-devel >= 0.158 zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex
 BuildRequires: audit-libs-devel
 %endif
 %if %{with_tools}
@@ -651,7 +651,6 @@ Patch25054: rds-prevent-dereference-of-a-NULL-device-in-rds_iw_laddr_check.patch
 Patch25055: net-enic-include-irq.h-for-irqreturn_t-definitions.patch
 Patch25056: net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch
 Patch25057: net-qlcnic-include-irq.h-for-irq-definitions.patch
-Patch25058: arm64-Fix-duplicated-Kconfig-entries-again.patch
 Patch25059: btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch
 
 # END OF PATCH DEFINITIONS
@@ -1310,7 +1309,6 @@ ApplyPatch rds-prevent-dereference-of-a-NULL-device-in-rds_iw_laddr_check.patch
 ApplyPatch net-enic-include-irq.h-for-irqreturn_t-definitions.patch
 ApplyPatch net-bnx2x-include-irq.h-for-irqreturn_t-definitions.patch
 ApplyPatch net-qlcnic-include-irq.h-for-irq-definitions.patch
-ApplyPatch arm64-Fix-duplicated-Kconfig-entries-again.patch
 ApplyPatch btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch
 
 # END OF PATCH APPLICATIONS
@@ -2092,6 +2090,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Apr 02 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.0-0.rc0.git7.1
+- Linux v3.14-5146-g0f1b1e6d73cb
+
 * Wed Apr 02 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.0-0.rc0.git6.1
 - Linux v3.14-4600-g467cbd207abd
 
diff --git a/sources b/sources
index fc78269..13225df 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 d36baf2d62de5aa61f10a976d00d2d2a  perf-man-3.14.tar.gz
-838073ead6c2a1b286e6071f43b087d7  patch-3.14-git6.xz
+322ca8dfc78f3b86243062f875c34bee  patch-3.14-git7.xz