diff options
| -rw-r--r-- | arm64-Fix-duplicated-Kconfig-entries-again.patch | 34 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-powerpc64 | 2 | ||||
| -rw-r--r-- | config-powerpc64p7 | 2 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 11 insertions, 39 deletions
diff --git a/arm64-Fix-duplicated-Kconfig-entries-again.patch b/arm64-Fix-duplicated-Kconfig-entries-again.patch deleted file mode 100644 index 154d8377..00000000 --- a/arm64-Fix-duplicated-Kconfig-entries-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a5574be3731095703675ad08b6f5e9697b361ffe Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Wed, 2 Apr 2014 10:14:43 -0400 -Subject: [PATCH] arm64: Fix duplicated Kconfig entries again - -Commit 74397174989e5f70 attempted to clean up the power management options -for arm64, but when things were merged it didn't fully take effect. Fix -it again. - -Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> ---- - arch/arm64/Kconfig | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 07aa3556952c..8033b9b8a2df 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -321,12 +321,6 @@ menu "CPU Power Management" - - source "drivers/cpuidle/Kconfig" - --source "drivers/cpufreq/Kconfig" -- --endmenu -- --menu "Power management options" -- - source "kernel/power/Kconfig" - - source "drivers/cpufreq/Kconfig" --- -1.8.5.3 - diff --git a/config-generic b/config-generic index 7dca1059..967e776e 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 4b8ba84a..e5d6d8b1 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 4fe09eee..8981119e 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 27130c02..79138c5d 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@fedoraproject.org> - 3.15.0-0.rc0.git7.1 +- Linux v3.14-5146-g0f1b1e6d73cb + * Wed Apr 02 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc0.git6.1 - Linux v3.14-4600-g467cbd207abd @@ -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 |