Commit 90fb04f8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.6' of... 

Merge tag 'asoc-v5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.6

A pretty big release this time around, a lot of new drivers and both
Morimoto-san and Takashi were doing subsystem wide updates as well:

 - Further big refactorings from Morimoto-san simplifying the core
   interfaces and moving things to the component level.
 - Transition of drivers to managed buffer allocation and removal of
   redundant PCM ioctls.
 - New driver support for Ingenic JZ4770, Mediatek MT6660, Qualcomm
   WCD934x and WSA881x, and Realtek RT700, RT711, RT715, RT1011, RT1015
   and RT1308.
parents 9b132f27 a7196caf

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ Jacob Shin <Jacob.Shin@amd.com> 
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>

Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>

James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>
@@ -152,6 +153,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
@@ -265,6 +267,7 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org> 
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>

Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
@@ -276,3 +279,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+11 −2
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ Description: This file shows the system fans direction: 


		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version



Date:		November 2018

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.

		on LED or Gearbox board.



		The files are read only.
@@ -121,6 +121,15 @@ Description: These files show the system reset cause, as following: ComEx 


		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version

Date:		November 2018

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.



		The files are read only.



Date:		June 2019

KernelVersion:	5.3

Contact:	Vadim Pasternak <vadimpmellanox.com>

Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/MLNXBF04:00/driver/lifecycle_state

What:		/sys/bus/platform/devices/MLNXBF04:00/lifecycle_state

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -10,7 +10,7 @@ Description: 
		  GA Non-Secured - Non-Secure chip and not able to change state

		  RMA - Return Merchandise Authorization



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/post_reset_wdog

What:		/sys/bus/platform/devices/MLNXBF04:00/post_reset_wdog

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -19,7 +19,7 @@ Description: 
		to reboot the chip and recover it to the old state if the new

		boot partition fails.



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/reset_action

What:		/sys/bus/platform/devices/MLNXBF04:00/reset_action

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -30,7 +30,7 @@ Description: 
		  emmc - boot from the onchip eMMC

		  emmc_legacy - boot from the onchip eMMC in legacy (slow) mode



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/second_reset_action

What:		/sys/bus/platform/devices/MLNXBF04:00/second_reset_action

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -44,7 +44,7 @@ Description: 
		  swap_emmc - swap the primary / secondary boot partition

		  none - cancel the action



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/secure_boot_fuse_state

What:		/sys/bus/platform/devices/MLNXBF04:00/secure_boot_fuse_state

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"

Documentation/admin-guide/device-mapper/dm-integrity.rst

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ journal_crypt:algorithm(:key) (the key is optional) 
	Encrypt the journal using given algorithm to make sure that the

	attacker can't read the journal. You can use a block cipher here

	(such as "cbc(aes)") or a stream cipher (for example "chacha20",

	"salsa20", "ctr(aes)" or "ecb(arc4)").

	"salsa20" or "ctr(aes)").



	The journal contains history of last writes to the block device,

	an attacker reading the journal could see the last sector nubmers

Documentation/admin-guide/device-mapper/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Device Mapper 
    cache-policies

    cache

    delay

    dm-clone

    dm-crypt

    dm-dust

    dm-flakey

CRA Git | Maintained and supported by SUSTech CRA and CCSE