Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/intel/boards/Kconfig
between commit:
82e8d723e9e6 ("sound: Fix Kconfig indentation")
from the sound tree and commit:
47cbea216281 ("ASoC: Intel: eve: Enable mclk and ssp sclk early")
from the sound-aso
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/samsung/Kconfig
between commit:
82e8d723e9e6 ("sound: Fix Kconfig indentation")
from the sound tree and commits:
03081cc370b9 ("ASoC: samsung: arndale: Add support for WM1811 CODEC")
dca6408d6f7e ("AS
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/sof/intel/hda-dsp.c
between commit:
19abfefd4c76 ("ALSA: hda: Direct MMIO accesses")
from the sound tree and commits:
fd15f2f5e272 ("ASoC: SOF: Intel: hda: Enable jack detection")
d06973515f95 ("ASoC:
Hi all,
Today's linux-next merge of the sound-asoc tree (yesterday' version)
got a conflict in:
sound/soc/intel/skylake/skl.c
between commit:
19abfefd4c76 ("ALSA: hda: Direct MMIO accesses")
from the sound tree and commit:
bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into
On 7/31/19 9:50 PM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the sound-asoc tree got conflicts in:
sound/soc/intel/skylake/skl-nhlt.c
sound/soc/intel/skylake/skl.h
between commit:
1169cbf6b98e ("ASoC: Intel: Skylake: use common NHLT module")
from the sound tree
Hi all,
Today's linux-next merge of the sound-asoc tree got conflicts in:
sound/soc/intel/skylake/skl-nhlt.c
sound/soc/intel/skylake/skl.h
between commit:
1169cbf6b98e ("ASoC: Intel: Skylake: use common NHLT module")
from the sound tree and commit:
bcc2a2dc3ba8 ("ASoC: Intel: Skylake:
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/intel/sst-mfld-platform-pcm.c between commit ef46c7af93f9
("ALSA: pcm: Embed struct device") from the sound tree and commit
8686f251e482 ("ASoC: intel: Remove unnecessary
snd_pcm_lib_preallocate_free_for_all()") fr
7 matches
Mail list logo