Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 113adf21 authored Aug 06, 2015 by Mark Brown

Merge tag 'asoc-fix-v4.2-rc3' into asoc-fix-topology

ASoC: Fixes for v4.2

A lot of small fixes here, a few to the core:

 - Fix for binding DAPM stream widgets on devices with prefixes assigned
   to them
 - Minor fixes for the newly added topology interfaces
 - Locking and memory leak fixes for DAPM
 - Driver specific fixes

parents c3879956 996034b1

.mailmap

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>
			Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
	Sumit Semwal <sumit.semwal@ti.com>		Sumit Semwal <sumit.semwal@ti.com>
	Tejun Heo <htejun@gmail.com>		Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	@@ -125,7 +126,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
			Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
			Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-bus-iio

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1234,10 +1234,8 @@ Description:
	object is near the sensor, usually be observing		object is near the sensor, usually be observing
	reflectivity of infrared or ultrasound emitted.		reflectivity of infrared or ultrasound emitted.
	Often these sensors are unit less and as such conversion		Often these sensors are unit less and as such conversion
	to SI units is not possible. Where it is, the units should		to SI units is not possible. Higher proximity measurements
	be meters. If such a conversion is not possible, the reported		indicate closer objects, and vice versa.
	values should behave in the same way as a distance, i.e. lower
	values indicate something is closer to the sensor.

	What: /sys/.../iio:deviceX/in_illuminance_input		What: /sys/.../iio:deviceX/in_illuminance_input
	What: /sys/.../iio:deviceX/in_illuminance_raw		What: /sys/.../iio:deviceX/in_illuminance_raw

Documentation/DocBook/drm.tmpl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
	<td valign="top" >TBD</td>		<td valign="top" >TBD</td>
	</tr>		</tr>
	<tr>		<tr>
	<td rowspan="2" valign="top" >omap</td>		<td valign="top" >omap</td>
	<td valign="top" >Generic</td>		<td valign="top" >Generic</td>
	<td valign="top" >“zorder”</td>		<td valign="top" >“zorder”</td>
	<td valign="top" >RANGE</td>		<td valign="top" >RANGE</td>

Documentation/arm/SPEAr/overview.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,4 +60,4 @@ Introduction
	Document Author		Document Author
	---------------		---------------

	Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics		Viresh Kumar <vireshk@kernel.org>, (c) 2010-2012 ST Microelectronics

Documentation/device-mapper/cache.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -258,6 +258,12 @@ cache metadata mode : ro if read-only, rw if read-write
	no further I/O will be permitted and the status will just		no further I/O will be permitted and the status will just
	contain the string 'Fail'. The userspace recovery tools		contain the string 'Fail'. The userspace recovery tools
	should then be used.		should then be used.
			needs_check : 'needs_check' if set, '-' if not set
			A metadata operation has failed, resulting in the needs_check
			flag being set in the metadata's superblock. The metadata
			device must be deactivated and checked/repaired before the
			cache can be made fully operational again. '-' indicates
			needs_check is not set.

	Messages		Messages
	--------		--------