Commit d69d137e authored Nov 16, 2022 by Takashi Iwai

Merge branch 'for-linus' into for-next



Back-merge of devel branch for further fixes of memalloc helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parents d59b6f21 1abfd71e

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
		Uwe Kleine-König <ukleinek@strlen.de>

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ title: Audio codec controlled by ChromeOS EC

		maintainers:
		- Cheng-Yi Chiang <cychiang@chromium.org>
		- Tzung-Bi Shih <tzungbi@google.com>
		- Tzung-Bi Shih <tzungbi@kernel.org>

		description: \|
		Google's ChromeOS EC codec is a digital mic codec provided by the

Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Realtek rt1015p codec devicetree bindings

		maintainers:
		- Tzung-Bi Shih <tzungbi@google.com>
		- Tzung-Bi Shih <tzungbi@kernel.org>

		description: \|
		Rt1015p is a rt1015 variant which does not support I2C and

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -4906,7 +4906,7 @@ F: drivers/platform/chrome/

		CHROMEOS EC CODEC DRIVER
		M: Cheng-Yi Chiang <cychiang@chromium.org>
		M: Tzung-Bi Shih <tzungbi@google.com>
		M: Tzung-Bi Shih <tzungbi@kernel.org>
		R: Guenter Roeck <groeck@chromium.org>
		L: chrome-platform@lists.linux.dev
		S: Maintained

include/sound/control.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@ int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
		int snd_ctl_replace(struct snd_card card, struct snd_kcontrol kcontrol, bool add_on_replace);
		int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
		int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id src_id, struct snd_ctl_elem_id dst_id);
		void snd_ctl_rename(struct snd_card card, struct snd_kcontrol kctl, const char *name);
		int snd_ctl_activate_id(struct snd_card card, struct snd_ctl_elem_id id, int active);
		struct snd_kcontrol snd_ctl_find_numid(struct snd_card card, unsigned int numid);
		struct snd_kcontrol snd_ctl_find_id(struct snd_card card, struct snd_ctl_elem_id *id);