linux

mainlining shenanigans

Go to file

Mark Brown eaf8df8f39 Merge series "ASoC: simple-card / audio-graph re-cleanup" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>: Hi Mark, Guillaume I'm so sorry to bother you again and again. These are v2 of simple-card / audio-graph re-cleanup. KernelCI had reported that below patches broke kontron-sl28-var3-ads2 sound card probing. `434392271a` "ASoC: simple-card: add simple_link_init()" `59c35c44a9` "ASoC: simple-card: add simple_parse_node()" Main issue I'm understanding is name create timing. We want to create dailink->name via dlc->dai_name. But in CPU case, this dai_name might be removed by asoc_simple_canonicalize_cpu() if it CPU was single DAI. Thus, we need to A) get dlc->dai_name B) create dailink->name via dlc->dai_name C) call asoc_simple_canonicalize_cpu() Above reverted patch did A->C->B. My previous v1 patch did B->A->C. I'm so sorry that I didn't deep test on v1. I hope v2 patches has no issues on kontron-sl28-var3-ads2. Link: https://lore.kernel.org/r/87cztzcq56.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/87h7k0i437.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/20210423175318.13990-1-broonie@kernel.org Link: https://lore.kernel.org/r/3ca62063-41b4-c25b-a7bc-8a8160e7b684@collabora.com Kuninori Morimoto (4): ASoC: simple-card: add simple_parse_node() ASoC: simple-card: add simple_link_init() ASoC: audio-graph: tidyup graph_dai_link_of_dpcm() ASoC: audio-graph: tidyup graph_parse_node() sound/soc/generic/audio-graph-card.c \| 57 ++++----- sound/soc/generic/simple-card.c \| 168 +++++++++++++-------------- 2 files changed, 112 insertions(+), 113 deletions(-) -- 2.25.1		2021-05-11 19:16:13 +01:00
arch	Two fixes:	2021-03-28 12:19:16 -07:00
block	block: don't create too many partitions	2021-03-27 09:22:18 -06:00
certs
crypto
Documentation	ASoC: mt6359: Drop ASoC mt6359 ASoC accdet jack document	2021-04-16 19:30:07 +01:00
drivers	ALSA: control - add generic LED API	2021-03-31 17:16:14 +01:00
fs	5 cifs/smb3 fixes, 2 for stable, includes an important fix for encryption and an ACL fix, as well as a fix for possible reflink data corruption	2021-03-28 12:06:21 -07:00
include	ASoC: audio-graph: move audio_graph_remove() to simple-card-utils.c	2021-04-20 17:25:45 +01:00
init	Merge branch 'akpm' (patches from Andrew)	2021-03-14 12:23:34 -07:00
ipc
kernel	io_uring-5.12-2021-03-27	2021-03-28 11:42:05 -07:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-03-24 18:16:04 -07:00
LICENSES
mm	Merge branch 'akpm' (patches from Andrew)	2021-03-25 11:43:43 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-03-24 18:16:04 -07:00
samples	Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2021-03-09 17:15:56 -08:00
scripts	kbuild: fix ld-version.sh to not be affected by locale	2021-03-13 11:12:13 +09:00
security	integrity-v5.12-fix	2021-03-25 16:46:43 -07:00
sound	Merge series "ASoC: simple-card / audio-graph re-cleanup" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:	2021-05-11 19:16:13 +01:00
tools	Some more perf tools fixes for v5.12:	2021-03-28 13:22:54 -07:00
usr
virt
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap	Merge branch 'akpm' (patches from Andrew)	2021-03-25 11:43:43 -07:00
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS	ALSA: control - add generic LED API	2021-03-31 17:16:14 +01:00
Makefile	Linux 5.12-rc5	2021-03-28 15:48:16 -07:00
README

README

Linux kernel
============

There are several guides for kernel developers and users. These guides can
be rendered in a number of formats, like HTML and PDF. Please read
Documentation/admin-guide/README.rst first.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.  The formatted documentation can also be read online at:

    https://www.kernel.org/doc/html/latest/

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.