Linux v3.14-12376-g4ba85265790b

6 files changed, 9 insertions, 43 deletions

diff --git a/config-armv7 b/config-armv7
index d085f236f..ba0b2b6ee 100644
--- a/config-armv7
+++ b/config-armv7
@@ -154,6 +154,7 @@ CONFIG_EXTCON_PALMAS=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
 CONFIG_RTC_DRV_PALMAS=m
 
 CONFIG_WL_TI=y
@@ -607,6 +608,7 @@ CONFIG_GPIO_XILINX=y
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_I2C_CADENCE=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
diff --git a/config-generic b/config-generic
index 1d2190169..4607267c1 100644
--- a/config-generic
+++ b/config-generic
@@ -4738,6 +4738,7 @@ CONFIG_DW_DMAC_PCI=m
 # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_DMATEST is not set
+# CONFIG_FSL_EDMA is not set
 CONFIG_ASYNC_TX_DMA=y
 
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/config-x86-generic b/config-x86-generic
index 25e87818a..bcac9b274 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -220,6 +220,7 @@ CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_WMI=m
 CONFIG_ASUS_NB_WMI=m
 CONFIG_HP_WIRELESS=m
diff --git a/kernel.spec b/kernel.spec
index 89d1a7438..95aca36eb 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 10
+%define gitrev 11
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -627,9 +627,6 @@ Patch22000: weird-root-dentry-name-debug.patch
 
 Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-#Fixes module loading on ppc64le
-Patch25036: ppc64le_module_fix.patch
-
 Patch25058: net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch
 Patch25059: btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch
 Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
@@ -1276,9 +1273,6 @@ ApplyPatch ath9k_rx_dma_stop_check.patch
 
 ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-# Fixes module loading on ppc64le
-ApplyPatch ppc64le_module_fix.patch
-
 ApplyPatch net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch
 ApplyPatch btrfs-fix-lockdep-warning-with-reclaim-lock-inversion.patch
 ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
@@ -2068,6 +2062,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Apr 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc0.git11.1
+- Linux v3.14-12376-g4ba85265790b
+
 * Thu Apr 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Backported HID RMI driver for Haswell Dell XPS machines from Benjamin Tissoires (rhbz 1048314)
 
diff --git a/ppc64le_module_fix.patch b/ppc64le_module_fix.patch
deleted file mode 100644
index 77e6f55eb..000000000
--- a/ppc64le_module_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 414794ae6a59c38f6e5793ad50df97cba3dda4e3 Mon Sep 17 00:00:00 2001
-From: Tony Breeds <tony@bakeyournoodle.com>
-Date: Thu, 30 Jan 2014 19:58:55 +1100
-Subject: [PATCH] powerpc/le: Avoid creatng R_PPC64_TOCSAVE relocations for
- modules.
-
-When building modules with a native le toolchain the linker will
-generate R_PPC64_TOCSAVE relocations when it's safe to omit saving r2 on
-a plt call.  This isn't helpful in the conext of a kernel module and the
-kernel will fail to load those modules with an error like:
-	nf_conntrack: Unknown ADD relocation: 109
-
-This patch tells the linker to avoid createing R_PPC64_TOCSAVE
-relocations allowing modules to load.
-
-Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
----
- arch/powerpc/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index 0f4344e..fff3945 100644
---- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -74,6 +74,9 @@ override CROSS32AS += -mlittle-endian
- LDEMULATION	:= lppc
- GNUTARGET	:= powerpcle
- MULTIPLEWORD	:= -mno-multiple
-+ifeq ($(call cc-option-yn,-mno-save-toc-indirect),y)
-+       KBUILD_CFLAGS_MODULE += -mno-save-toc-indirect
-+endif
- else
- ifeq ($(call cc-option-yn,-mbig-endian),y)
- override CC	+= -mbig-endian
--- 
diff --git a/sources b/sources
index ed9a0d849..0196717c9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 d36baf2d62de5aa61f10a976d00d2d2a  perf-man-3.14.tar.gz
-9b89bbd8bc248fccc00565479d44fd8e  patch-3.14-git10.xz
+61f25b4b1b5666828c8ee04779105477  patch-3.14-git11.xz