Mark Brown [Thu, 22 Aug 2013 13:28:54 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:53 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:53 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:52 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:52 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:51 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:50 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:50 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:49 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:49 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:48 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:48 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:47 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm3008' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:45 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:45 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:44 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:44 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:42 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:42 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max9877' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:41 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:41 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:40 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/lm4857' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:39 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:39 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:38 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:38 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:37 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:32 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:32 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/cs4270' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:31 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:30 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:30 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/bt' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:29 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:29 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:28 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:27 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:27 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:26 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4554' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:25 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:24 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ads711x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:24 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:23 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/adau1701' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:23 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ad73311' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:22 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ad1980' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:22 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-next
Mark Brown [Thu, 22 Aug 2013 13:28:21 +0000 (14:28 +0100)]
Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linus
Tushar Behera [Thu, 22 Aug 2013 12:45:02 +0000 (18:15 +0530)]
ASoC: samsung: Fix build error with dma function rename
commit
85ff3c29d720 ("ASoC: samsung: Rename DMA platform registration
functions") renames the DMA registration functions. Fix the places where
it was left out.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Michael Grzeschik [Mon, 19 Aug 2013 15:06:01 +0000 (17:06 +0200)]
ASoC: fsl: disable ssi irq for imx
We have to disable the ssi irq, as it is not safe for all platforms to
write back into the status register. It also runs into non-linefetch
aborts.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Michael Grzeschik [Mon, 19 Aug 2013 15:06:00 +0000 (17:06 +0200)]
ASoC: fsl-ssi: imx-pcm-fiq bugfix
imx-pcm-fiq is checking for TE RE bits, so enable them only if
necessary.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Steffen Trumtrar [Mon, 19 Aug 2013 15:05:59 +0000 (17:05 +0200)]
ASoC: fsl-ssi: add SSIEN errata work around
The chip errata for the i.MX35, Rev.2 has the following errata:
ENGcm06222: SSI:Transmission does not take place in bit length early frame sync
configuration
The workaround states, that TX_EN and SSI_EN bits should be set in the same
register write. As the next errata in the document (ENGcm06532) says to always
write RX_EN and TX_EN in the same register write in network mode.
Therefore include the whole write to
CCSR_SSI_SCR_TE and CCSR_SSI_SCR_RE
into the write to
CCSR_SSI_SCR_SSIEN
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Markus Pargmann [Mon, 19 Aug 2013 15:05:58 +0000 (17:05 +0200)]
ASoC: fsl-ssi: ac97-slave support
This patch adds ac97-slave support.
For ac97, the registers have to be setup earlier than for other ssi
modes because there is some communication with the external device
before streaming. So this patch introduces a fsl_ssi_setup function to
setup the registers for different ssi operation modes seperately.
This patch was tested with imx27-pca100.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 22 Aug 2013 10:09:03 +0000 (11:09 +0100)]
Merge remote-tracking branch 'asoc/topic/ac97' into asoc-fsl
Nicolin Chen [Wed, 21 Aug 2013 03:13:16 +0000 (11:13 +0800)]
ASoC: fsl: Add S/PDIF CPU DAI driver
This patch implements a device-tree-only CPU DAI driver for Freescale
S/PDIF controller that supports stereo playback and record feature.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Sachin Kamat [Thu, 22 Aug 2013 08:00:15 +0000 (13:30 +0530)]
ASoC: pxa: Remove duplicate inclusion of dmaengine.h
dmaengine.h header file was included twice.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Julia Lawall [Mon, 19 Aug 2013 08:51:51 +0000 (10:51 +0200)]
ASoC: omap: simplify platform_get_resource_byname/devm_ioremap_resource
Remove unneeded error handling on the result of a call to
platform_get_resource_byname when the value is passed to devm_ioremap_resource.
In the case of omap-dmic.c, the error-handling code of
devm_ioremap_resource is also corrected to include releasing the clock.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,e,e1;
expression ret != 0;
identifier l;
@@
res = platform_get_resource_byname(...);
- if (res == NULL) { ... \(goto l;\|return ret;\) }
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Fabio Estevam [Sat, 17 Aug 2013 21:13:00 +0000 (18:13 -0300)]
ASoC: fsl: fsl_ssi: Fix the order of resources removal
In fsl_ssi_remove() we need to remove the resources in the opposite order that
they were acquired in probe.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Markus Pargmann [Mon, 19 Aug 2013 15:05:55 +0000 (17:05 +0200)]
ASoC: core: Generic ac97 link reset functions
This patch adds generic ac97 reset functions using pincontrol and gpio
parsed from devicetree.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 21:59:05 +0000 (22:59 +0100)]
ASoC: samsung: Rename DMA platform registration functions
The current naming with a simple asoc_ prefix is too generic for use in
multiplatform kernels.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Mark Brown [Mon, 19 Aug 2013 19:33:20 +0000 (20:33 +0100)]
ASoC: samsung: Check to see if we managed to allocate a channel
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Mark Brown [Fri, 16 Aug 2013 11:07:19 +0000 (12:07 +0100)]
ASoC: imx: Add MODULE_LICENSE to DMA drivers
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:10:08 +0000 (12:10 +0100)]
ASoC: spdif: Remove duplicate const
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:09:39 +0000 (12:09 +0100)]
ASoC: spdif: Add stub DAPM widgets for Rx
Ensure that the driver continues to work with mandatory DAPM.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:16:19 +0000 (12:16 +0100)]
ASoC: bt-sco: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:13:14 +0000 (12:13 +0100)]
ASoC: bt-sco: Add generic compatible string
Provide a common compatible string for device trees to list as a fallback
for simplicity. We don't currently have a binding document but let's not
fix that right now...
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:17:36 +0000 (12:17 +0100)]
ASoC: hdmi: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 19 Aug 2013 11:18:07 +0000 (12:18 +0100)]
ASoC: ac97: Provide stub DAPM integration
Ensure continued operation with DAPM being mandatory.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:59:19 +0000 (23:59 +0100)]
ASoC: wm8997: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:59:08 +0000 (23:59 +0100)]
ASoC: wm5110: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 12 Aug 2013 22:58:58 +0000 (23:58 +0100)]
ASoC: wm5102: Add inputs for noise and mic mixers
The noise and mic mixer inputs were not connected, do so.
Signed-off-by: Mark Brown <broonie@linaro.org>
Linus Torvalds [Sun, 18 Aug 2013 21:36:53 +0000 (14:36 -0700)]
Linux 3.11-rc6
Mark Brown [Sun, 11 Aug 2013 11:29:07 +0000 (12:29 +0100)]
ASoC: cs4270: Add DAPM support
This makes it possible to hook the device into a more complex board and
ensures it will continue to work with non-DAPM support removed from the
core.
Signed-off-by: Mark Brown <broonie@linaro.org>
Linus Torvalds [Sun, 18 Aug 2013 15:51:28 +0000 (08:51 -0700)]
Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"This contains one patch to fix the return value of cpuset's cgroups
interface function, which used to always return -ENODEV for the writes
on the 'memory_pressure_enabled' file"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: fix the return value of cpuset_write_u64()
Mark Brown [Thu, 15 Aug 2013 11:04:28 +0000 (12:04 +0100)]
ASoC: pcm3008: Manage DAC and ADC power with DAPM
Rather than leaving the DAC and ADC active whenever the system is running
manage their power with DAPM.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 15 Aug 2013 11:01:40 +0000 (12:01 +0100)]
ASoC: pcm3008: Add DAPM support
Make it possible to connect external devices to the CODEC and ensure
continued operation with non-DAPM support removed from the core.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Thu, 15 Aug 2013 10:53:28 +0000 (11:53 +0100)]
ASoC: pcm3008: Use gpio_set_value_cansleep()
We don't set the GPIO values from atomic context so support GPIOs that
can't be controlled from atomic context.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mike Dyer [Fri, 16 Aug 2013 17:36:28 +0000 (18:36 +0100)]
ASoC: wm8960: Fix PLL register writes
Bit 9 of PLL2,3 and 4 is reserved as '0'. The 24bit fractional part
should be split across each register in 8bit chunks.
Signed-off-by: Mike Dyer <mike.dyer@md-soft.co.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
Fabio Estevam [Sat, 17 Aug 2013 19:38:12 +0000 (16:38 -0300)]
ASoC: fsl: Drop SND_SOC_FSL_UTILS from i.mx machine code
SND_SOC_FSL_UTILS is only used by PowerPC machines, so let's drop it in the
i.mx case.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 16 Aug 2013 10:54:51 +0000 (11:54 +0100)]
ASoC: si476x: Add DAPM support
This ensures the driver continues to work with DAPM mandatory and makes
it easier to connect the device up to other components in the subsystem.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Linus Torvalds [Sat, 17 Aug 2013 17:43:19 +0000 (10:43 -0700)]
Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4
Pull jbd2 bug fixes from Ted Ts'o:
"Two jbd2 bug fixes, one of which is a regression fix"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: Fix oops in jbd2_journal_file_inode()
jbd2: Fix use after free after error in jbd2_journal_dirty_metadata()
Guenter Roeck [Sat, 17 Aug 2013 03:50:55 +0000 (20:50 -0700)]
s390: Fix broken build
Fix this build error:
In file included from fs/exec.c:61:0:
arch/s390/include/asm/tlb.h:35:23: error: expected identifier or '(' before 'unsigned'
arch/s390/include/asm/tlb.h:36:1: warning: no semicolon at end of struct or union [enabled by default]
arch/s390/include/asm/tlb.h: In function 'tlb_gather_mmu':
arch/s390/include/asm/tlb.h:57:5: error: 'struct mmu_gather' has no member named 'end'
Broken due to commit
2b047252d0 ("Fix TLB gather virtual address range
invalidation corner cases").
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
[ Oh well. We had build testing for ppc amd um, but no s390 - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Robin Holt [Fri, 16 Aug 2013 23:01:42 +0000 (18:01 -0500)]
MAINTAINERS: Change ownership for SGI specific modules.
I have taken a different job. I am removing myself as maintainer of
GRU. Dimitri will continue to maintain the SGI GRU driver, changing the
XP/XPC/XPNET maintainer to Cliff Whickman, but leaving behind my
personal email address to answer any questions about the design or
operation of the XP family of drivers.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jan Kara [Sat, 17 Aug 2013 01:19:41 +0000 (21:19 -0400)]
jbd2: Fix oops in jbd2_journal_file_inode()
Commit
0713ed0cde76438d05849f1537d3aab46e099475 added
jbd2_journal_file_inode() call into ext4_block_zero_page_range().
However that function gets called from truncate path and thus inode
needn't have jinode attached - that happens in ext4_file_open() but
the file needn't be ever open since mount. Calling
jbd2_journal_file_inode() without jinode attached results in the oops.
We fix the problem by attaching jinode to inode also in ext4_truncate()
and ext4_punch_hole() when we are going to zero out partial blocks.
Reported-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Linus Torvalds [Fri, 16 Aug 2013 23:52:29 +0000 (16:52 -0700)]
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"The usual collection of random fixes. Also some further fixes to the
last set of security fixes, and some more from Will (which you may
already have in a slightly different form)"
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7807/1: kexec: validate CPU hotplug support
ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
ARM: 7811/1: locks: use early clobber in arch_spin_trylock
ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()
ARM: 7809/1: perf: fix event validation for software group leaders
ARM: Fix FIQ code on VIVT CPUs
ARM: Fix !kuser helpers case
ARM: Fix the world famous typo with is_gate_vma()
Linus Torvalds [Fri, 16 Aug 2013 23:49:06 +0000 (16:49 -0700)]
Merge branch 'for-3.11' of git://git./linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"These are two critical fixes, needed by distro kernels, and thus also
destined for stable:
- The do_div() commit fixes a crash in mounting btrfs volumes, which
was a regression from 3.2,
- The ARAnyM fix allows to have NatFeat drivers as loadable modules,
which is needed for initrds"
* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Truncate base in do_div()
m68k/atari: ARAnyM - Fix NatFeat module support
Linus Torvalds [Fri, 16 Aug 2013 17:00:18 +0000 (10:00 -0700)]
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull clock controller fixes from Michael Turquette:
"Two small fixes for the Zynq clock controller introduced in 3.11-rc1
and another Exynos clock patch which fixes a regression that prevents
the video pipeline from functioning on that platform"
* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
clk/zynq/clkc: Add dedicated spinlock for the SWDT
Linus Torvalds [Fri, 16 Aug 2013 16:59:00 +0000 (09:59 -0700)]
Merge tag 'pm-3.11-rc6' of git://git./linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"The removal of delayed_work_pending() checks from kernel/power/qos.c
done in 3.9 introduced a deadlock in pm_qos_work_fn().
Fix from Stephen Boyd"
* tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
Linus Torvalds [Fri, 16 Aug 2013 16:58:21 +0000 (09:58 -0700)]
Merge tag 'sound-3.11' of git://git./linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This batch contains a few USB audio fixes, a couple of HD-audio
quirks, various small ASoC driver fixes in addition to an ASoC core
fix that may lead to memory corruption.
Unfortunately slightly more volume than the previous pull request, but
all are reasonable regression fixes"
* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Add a fixup for Gateway LT27
ASoC: tegra: fix Tegra30 I2S capture parameter setup
ALSA: usb-audio: Fix invalid volume resolution for Logitech HD Webcam C525
ALSA: hda - Fix missing mute controls for CX5051
ALSA: usb-audio: fix automatic Roland/Yamaha MIDI detection
ALSA: 6fire: make buffers DMA-able (midi)
ALSA: 6fire: make buffers DMA-able (pcm)
ALSA: hda - Add pinfix for LG LW25 laptop
ASoC: cs42l52: Add new TLV for Beep Volume
ASoC: cs42l52: Reorder Min/Max and update to SX_TLV for Beep Volume
ASoC: dapm: Fix empty list check in dapm_new_mux()
ASoC: sgtl5000: fix buggy 'Capture Attenuate Switch' control
ASoC: sgtl5000: prevent playback to be muted when terminating concurrent capture
Linus Torvalds [Fri, 16 Aug 2013 16:57:38 +0000 (09:57 -0700)]
Merge tag 'usb-3.11-rc6' of git://git./linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some small USB fixes for 3.11-rc6 that have accumulated.
Nothing huge, a EHCI fix that solves a much-reported audio USB
problem, some usb-serial driver endian fixes and other minor fixes, a
wireless USB oops fix, and two new quirks"
* tag 'usb-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: keyspan: fix null-deref at disconnect and release
USB: mos7720: fix broken control requests
usb: add two quirky touchscreen
USB: ti_usb_3410_5052: fix big-endian firmware handling
USB: adutux: fix big-endian device-type reporting
USB: usbtmc: fix big-endian probe of Rigol devices
USB: mos7840: fix big-endian probe
USB-Serial: Fix error handling of usb_wwan
wusbcore: fix kernel panic when disconnecting a wireless USB->serial device
USB: EHCI: accept very late isochronous URBs
Linus Torvalds [Fri, 16 Aug 2013 16:35:29 +0000 (09:35 -0700)]
Merge git://git./linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Fix SKB leak in 8139cp, from Dave Jones.
2) Fix use of *_PAGES interfaces with mlx5 firmware, from Moshe Lazar.
3) RCU conversion of macvtap introduced two races, fixes by Eric
Dumazet
4) Synchronize statistic flows in bnx2x driver to prevent corruption,
from Dmitry Kravkov
5) Undo optimization in IP tunneling, we were using the inner IP header
in some cases to inherit the IP ID, but that isn't correct in some
circumstances. From Pravin B Shelar
6) Use correct struct size when parsing netlink attributes in
rtnl_bridge_getlink(). From Asbjoern Sloth Toennesen
7) Length verifications in tun_get_user() are bogus, from Weiping Pan
and Dan Carpenter
8) Fix bad merge resolution during 3.11 networking development in
openvswitch, albeit a harmless one which added some unreachable
code. From Jesse Gross
9) Wrong size used in flexible array allocation in openvswitch, from
Pravin B Shelar
10) Clear out firmware capability flags the be2net driver isn't ready to
handle yet, from Sarveshwar Bandi
11) Revert DMA mapping error checking addition to cxgb3 driver, it's
buggy. From Alexey Kardashevskiy
12) Fix regression in packet scheduler rate limiting when working with a
link layer of ATM. From Jesper Dangaard Brouer
13) Fix several errors in TCP Cubic congestion control, in particular
overflow errors in timestamp calculations. From Eric Dumazet and
Van Jacobson
14) In ipv6 routing lookups, we need to backtrack if subtree traversal
don't result in a match. From Hannes Frederic Sowa
15) ipgre_header() returns incorrect packet offset. Fix from Timo Teräs
16) Get "low latency" out of the new MIB counter names. From Eliezer
Tamir
17) State check in ndo_dflt_fdb_del() is inverted, from Sridhar
Samudrala
18) Handle TCP Fast Open properly in netfilter conntrack, from Yuchung
Cheng
19) Wrong memcpy length in pcan_usb driver, from Stephane Grosjean
20) Fix dealock in TIPC, from Wang Weidong and Ding Tianhong
21) call_rcu() call to destroy SCTP transport is done too early and
might result in an oops. From Daniel Borkmann
22) Fix races in genetlink family dumps, from Johannes Berg
23) Flags passed into macvlan by the user need to be validated properly,
from Michael S Tsirkin
24) Fix skge build on 32-bit, from Stephen Hemminger
25) Handle malformed TCP headers properly in xt_TCPMSS, from Pablo Neira
Ayuso
26) Fix handling of stacked vlans in vlan_dev_real_dev(), from Nikolay
Aleksandrov
27) Eliminate MTU calculation overflows in esp{4,6}, from Daniel
Borkmann
28) neigh_parms need to be setup before calling the ->ndo_neigh_setup()
method. From Veaceslav Falico
29) Kill out-of-bounds prefetch in fib_trie, from Eric Dumazet
30) Don't dereference MLD query message if the length isn't value in the
bridge multicast code, from Linus Lüssing
31) Fix VXLAN IGMP join regression due to an inverted check, from Cong
Wang
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (70 commits)
net/mlx5_core: Support MANAGE_PAGES and QUERY_PAGES firmware command changes
tun: signedness bug in tun_get_user()
qlcnic: Fix diagnostic interrupt test for 83xx adapters
qlcnic: Fix beacon state return status handling
qlcnic: Fix set driver version command
net: tg3: fix NULL pointer dereference in tg3_io_error_detected and tg3_io_slot_reset
net_sched: restore "linklayer atm" handling
drivers/net/ethernet/via/via-velocity.c: update napi implementation
Revert "cxgb3: Check and handle the dma mapping errors"
be2net: Clear any capability flags that driver is not interested in.
openvswitch: Reset tunnel key between input and output.
openvswitch: Use correct type while allocating flex array.
openvswitch: Fix bad merge resolution.
tun: compare with 0 instead of total_len
rtnetlink: rtnl_bridge_getlink: Call nlmsg_find_attr() with ifinfomsg header
ethernet/arc/arc_emac - fix NAPI "work > weight" warning
ip_tunnel: Do not use inner ip-header-id for tunnel ip-header-id.
bnx2x: prevent crash in shutdown flow with CNIC
bnx2x: fix PTE write access error
bnx2x: fix memory leak in VF
...
Linus Torvalds [Thu, 15 Aug 2013 18:42:25 +0000 (11:42 -0700)]
Fix TLB gather virtual address range invalidation corner cases
Ben Tebulin reported:
"Since v3.7.2 on two independent machines a very specific Git
repository fails in 9/10 cases on git-fsck due to an SHA1/memory
failures. This only occurs on a very specific repository and can be
reproduced stably on two independent laptops. Git mailing list ran
out of ideas and for me this looks like some very exotic kernel issue"
and bisected the failure to the backport of commit
53a59fc67f97 ("mm:
limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT").
That commit itself is not actually buggy, but what it does is to make it
much more likely to hit the partial TLB invalidation case, since it
introduces a new case in tlb_next_batch() that previously only ever
happened when running out of memory.
The real bug is that the TLB gather virtual memory range setup is subtly
buggered. It was introduced in commit
597e1c3580b7 ("mm/mmu_gather:
enable tlb flush range in generic mmu_gather"), and the range handling
was already fixed at least once in commit
e6c495a96ce0 ("mm: fix the TLB
range flushed when __tlb_remove_page() runs out of slots"), but that fix
was not complete.
The problem with the TLB gather virtual address range is that it isn't
set up by the initial tlb_gather_mmu() initialization (which didn't get
the TLB range information), but it is set up ad-hoc later by the
functions that actually flush the TLB. And so any such case that forgot
to update the TLB range entries would potentially miss TLB invalidates.
Rather than try to figure out exactly which particular ad-hoc range
setup was missing (I personally suspect it's the hugetlb case in
zap_huge_pmd(), which didn't have the same logic as zap_pte_range()
did), this patch just gets rid of the problem at the source: make the
TLB range information available to tlb_gather_mmu(), and initialize it
when initializing all the other tlb gather fields.
This makes the patch larger, but conceptually much simpler. And the end
result is much more understandable; even if you want to play games with
partial ranges when invalidating the TLB contents in chunks, now the
range information is always there, and anybody who doesn't want to
bother with it won't introduce subtle bugs.
Ben verified that this fixes his problem.
Reported-bisected-and-tested-by: Ben Tebulin <tebulin@googlemail.com>
Build-testing-by: Stephen Rothwell <sfr@canb.auug.org.au>
Build-testing-by: Richard Weinberger <richard.weinberger@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Mark Brown [Fri, 16 Aug 2013 11:24:47 +0000 (12:24 +0100)]
ASoC: tlv320aic26: Add basic DAPM support
Provide external widgets for the CODEC to ensure the device continues to
function with DAPM mandatory and to make it easier to hook the device up
to other components.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 16 Aug 2013 11:14:42 +0000 (12:14 +0100)]
ASoC: tlv320aic26: Remove noisy print
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Fri, 16 Aug 2013 11:13:50 +0000 (12:13 +0100)]
ASoC: tlv320aic26: Remove direct use of internal I/O functions
Use the core to do I/O rather than directly calling the driver operations
in order to support further refactoring.
Signed-off-by: Mark Brown <broonie@linaro.org>
Padmavathi Venna [Fri, 16 Aug 2013 04:26:18 +0000 (09:56 +0530)]
ARM: dts: Change i2s compatible string on exynos5250
This patch removes quirks from i2s node and change the i2s
compatible names.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>