[kernel] Linux v3.11-3891-gae7a835

Thu Sep 5 12:17:04 UTC 2013

commit f55bd27d50aa3ee15819e85ca0984a3af33d3c30
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Thu Sep 5 08:15:59 2013 -0400

    Linux v3.11-3891-gae7a835

 ...oc-dmaengine-pcm-Add-support-for-new-DMAE.patch |    8 +-
 arm-exynos-mp.patch                                |    4 +-
 arm-imx-fixsound.patch                             |   65 --------------------
 config-armv7                                       |    1 +
 config-armv7-generic                               |    1 +
 config-generic                                     |    2 +
 config-powerpc64                                   |    2 +
 config-powerpc64p7                                 |    2 +
 kernel.spec                                        |    8 +-
 sources                                            |    2 +-
 10 files changed, 19 insertions(+), 76 deletions(-)
---

diff --git a/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch b/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch
index f5f7ce8..03e8927 100644
--- a/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch
+++ b/0011-sound-soc-soc-dmaengine-pcm-Add-support-for-new-DMAE.patch
@@ -12,13 +12,13 @@ helpers so that we can fetch and open channels using this method.
 
 Signed-off-by: Joel Fernandes <joelf at ti.com>
 ---
- sound/soc/soc-dmaengine-pcm.c | 22 ++++++++++++++++++++++
+ sound/core/pcm_dmaengine.c | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c
+diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
 index aa924d9..461fe4f 100644
---- a/sound/soc/soc-dmaengine-pcm.c
-+++ b/sound/soc/soc-dmaengine-pcm.c
+--- a/sound/core/pcm_dmaengine.c
++++ b/sound/core/pcm_dmaengine.c
 @@ -276,6 +276,16 @@ struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn,
  }
  EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel);
diff --git a/arm-exynos-mp.patch b/arm-exynos-mp.patch
index 15667ab..c0d17cd 100644
--- a/arm-exynos-mp.patch
+++ b/arm-exynos-mp.patch
@@ -315,8 +315,8 @@ index 5a8ad51..03688dd 100644
  
  config PINCTRL_EXYNOS
  	bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
--	depends on OF && GPIOLIB && ARCH_EXYNOS
-+	depends on OF && GPIOLIB && ARCH_EXYNOS_COMMON
+-	depends on OF && GPIOLIB && (ARCH_EXYNOS || ARCH_S5PV210)
++	depends on OF && GPIOLIB && (ARCH_EXYNOS_COMMON || ARCH_S5PV210)
  	select PINCTRL_SAMSUNG
  
  config PINCTRL_EXYNOS5440
diff --git a/config-armv7 b/config-armv7
index b703a78..b1ee5d1 100644
--- a/config-armv7
+++ b/config-armv7
@@ -388,6 +388,7 @@ CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
+CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
diff --git a/config-armv7-generic b/config-armv7-generic
index f6b7558..567a624 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -368,6 +368,7 @@ CONFIG_BMP085_SPI=m
 # Display
 
 CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 # CONFIG_CMA_DEBUG is not set
 CONFIG_CMA_SIZE_MBYTES=16
 CONFIG_CMA_SIZE_SEL_MBYTES=y
diff --git a/config-generic b/config-generic
index 2d6092e..d64d6d3 100644
--- a/config-generic
+++ b/config-generic
@@ -200,6 +200,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
 
 # CONFIG_CMA is not set
+# CONFIG_DMA_CMA is not set
 
 # CONFIG_SPI is not set
 
@@ -2195,6 +2196,7 @@ CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_INFINEON is not set
 # CONFIG_TCG_ST33_I2C is not set
+# CONFIG_TCG_XEN is not set
 CONFIG_TELCLOCK=m
 
 #
diff --git a/config-powerpc64 b/config-powerpc64
index 705a7ea..ae23e73 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -134,6 +134,8 @@ CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
 # CONFIG_KVM_EXIT_TIMING is not set
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 7ab1918..93ee2b2 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -125,6 +125,8 @@ CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=y
 # CONFIG_KVM_EXIT_TIMING is not set
diff --git a/kernel.spec b/kernel.spec
index 2eb8e22..0ff22bf 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 10
+%define gitrev 11
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -715,8 +715,6 @@ Patch21020: arm-tegra-usb-no-reset-linux33.patch
 
 # ARM wandboard
 Patch21030: arm-wandboard-quad.patch
-# https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/patch/?id=3f1a91aa25579ba5e7268a47a73d2a83e4802c62
-Patch21031: arm-imx-fixsound.patch
 
 # AM33xx
 Patch21040: 0001-reset-Add-driver-for-gpio-controlled-reset-pins.patch
@@ -1341,7 +1339,6 @@ ApplyPatch arm-highbank-for-3.12.patch
 ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-wandboard-quad.patch
-ApplyPatch arm-imx-fixsound.patch
 
 # Fix OMAP and AM33xx (BeagleBone)
 ApplyPatch 0001-reset-Add-driver-for-gpio-controlled-reset-pins.patch
@@ -2314,6 +2311,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Sep 05 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.12.0-0.rc0.git11.1
+- Linux v3.11-3891-gae7a835
+
 * Thu Sep 05 2013 Josh Boyer <jwboyer at fedoraproject.org> - 3.12.0-0.rc0.git10.1
 - Linux v3.11-3120-g816434e
 
diff --git a/sources b/sources
index 1124536..6c0a7e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 fea363551ff45fbe4cb88497b863b261  linux-3.11.tar.xz
-13ccec0de87a7120ac2a4b18e063c367  patch-3.11-git10.xz
+ae83dc4ffaba904f71be129a83d992b8  patch-3.11-git11.xz
