From fd61c6ae8ea324b1c3a5af52faa77cb77ede604d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 15 Sep 2013 00:23:32 +0000 Subject: [PATCH] Update to 3.11.1 svn path=/dists/trunk/linux/; revision=20630 --- debian/changelog | 23 ++++++- .../arm/ASoC-fsl-Fix-module-build.patch | 66 ------------------- debian/patches/series | 1 - 3 files changed, 21 insertions(+), 69 deletions(-) delete mode 100644 debian/patches/bugfix/arm/ASoC-fsl-Fix-module-build.patch diff --git a/debian/changelog b/debian/changelog index 5018dbde1..959352f6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,31 @@ -linux (3.11-1~exp2) UNRELEASED; urgency=low +linux (3.11.1-1~exp1) UNRELEASED; urgency=low + * New upstream stable update: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.11.1 + - target: Fix trailing ASCII space usage in INQUIRY vendor+model + - iscsi-target: Fix ImmediateData=Yes failure regression in >= v3.10 + - iscsi-target: Fix iscsit_transport reference leak during NP thread reset + - iscsi-target: Fix potential NULL pointer in solicited NOPOUT reject + - target: Fix se_cmd->state_list leak regression during WRITE failure + - mei: me: fix hardware reset flow + - usb: acm gadget: Null termintate strings table + - hwmon: (k10temp) Add support for Fam16h (Kabini) + - Drivers: hv: vmbus: Fix a bug in the handling of channel offers + - ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT + - drivers/misc/hpilo: Correct panic when an AUX iLO is detected + - ASoC: fsl: Fix module build + - imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id + - crypto: xor - Check for osxsave as well as avx in crypto/xor + - drivers/rtc/rtc-max77686.c: Fix wrong register + - mwifiex: do not create AP and P2P interfaces upon driver loading + + [ Ben Hutchings ] * udeb: Update config to match previous kernel config changes: - Remove ext{2,3}-modules - Update description of ext4-modules and let it provide ext{2,3}-modules - Remove aic7xxx_old, enc28j60 and imm from module lists - [sh4] kernel-image no longer provides ext3-modules * [hppa] udeb: kernel-image does not provide ext2-modules (since 3.2.7-1) - * [armhf] ASoC: fsl: Fix module build -- Ben Hutchings Fri, 13 Sep 2013 04:37:21 +0100 diff --git a/debian/patches/bugfix/arm/ASoC-fsl-Fix-module-build.patch b/debian/patches/bugfix/arm/ASoC-fsl-Fix-module-build.patch deleted file mode 100644 index 3e5560b8b..000000000 --- a/debian/patches/bugfix/arm/ASoC-fsl-Fix-module-build.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Fabio Estevam -Date: Mon, 29 Jul 2013 18:37:32 -0300 -Subject: ASoC: fsl: Fix module build -Origin: https://git.kernel.org/linus/3f1a91aa25579ba5e7268a47a73d2a83e4802c62 - -Building imx_v6_v7_defconfig with all audio drivers as modules results in -the folowing build error: - -ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! -ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! -ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! - -Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also -built as modules and by using 'IS_ENABLED' to cover the module case. - -Reported-by: Guennadi Liakhovetski -Signed-off-by: Fabio Estevam -Acked-by: Shawn Guo -Signed-off-by: Mark Brown -[bwh: Adjusted context for 3.11. This 'fix' just seems like a - workaround as it should always be OK for a module to use a built-in - symbol, but I don't have time to work but what's really going wrong.] ---- - sound/soc/fsl/Kconfig | 4 ++-- - sound/soc/fsl/imx-pcm.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/sound/soc/fsl/Kconfig -+++ b/sound/soc/fsl/Kconfig -@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI - tristate - - config SND_SOC_IMX_PCM_FIQ -- bool -+ tristate - select FIQ - - config SND_SOC_IMX_PCM_DMA -- bool -+ tristate - select SND_SOC_GENERIC_DMAENGINE_PCM - - config SND_SOC_IMX_AUDMUX ---- a/sound/soc/fsl/imx-pcm.h -+++ b/sound/soc/fsl/imx-pcm.h -@@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_ - dma_data->peripheral_type = IMX_DMATYPE_SSI; - } - --#ifdef CONFIG_SND_SOC_IMX_PCM_DMA -+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) - int imx_pcm_dma_init(struct platform_device *pdev); - void imx_pcm_dma_exit(struct platform_device *pdev); - #else -@@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(stru - } - #endif - --#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ -+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) - int imx_pcm_fiq_init(struct platform_device *pdev); - void imx_pcm_fiq_exit(struct platform_device *pdev); - #else diff --git a/debian/patches/series b/debian/patches/series index 115bd6ad4..f2f799bc2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -87,4 +87,3 @@ bugfix/all/HID-ntrig-validate-feature-report-details.patch bugfix/all/HID-sensor-hub-validate-feature-report-details.patch bugfix/all/HID-picolcd_core-validate-output-report-details.patch bugfix/all/HID-check-for-NULL-field-when-setting-values.patch -bugfix/arm/ASoC-fsl-Fix-module-build.patch