The patch ASoC: soc-topology: convert to SPDX identifiers has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f2b6a1b25fecc48a46c8a41636101af8a41c88a8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> Date: Mon, 2 Jul 2018 06:24:45 +0000 Subject: [PATCH] ASoC: soc-topology: convert to SPDX identifiers Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> --- include/sound/soc-topology.h | 7 ++---- sound/soc/soc-topology.c | 47 ++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 401ef2c45d6c..fa4b8413d2e2 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * linux/sound/soc-topology.h -- ALSA SoC Firmware Controls and DAPM * * Copyright (C) 2012 Texas Instruments Inc. * Copyright (C) 2015 Intel Corporation. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, * algorithms, equalisers, DAIs, widgets, FE caps, BE caps, codec link caps etc. */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 05d177d689e2..66e77e020745 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1,29 +1,24 @@ -/* - * soc-topology.c -- ALSA SoC Topology - * - * Copyright (C) 2012 Texas Instruments Inc. - * Copyright (C) 2015 Intel Corporation. - * - * Authors: Liam Girdwood <liam.r.girdwood@xxxxxxxxxxxxxxx> - * K, Mythri P <mythri.p.k@xxxxxxxxx> - * Prusty, Subhransu S <subhransu.s.prusty@xxxxxxxxx> - * B, Jayachandran <jayachandran.b@xxxxxxxxx> - * Abdullah, Omair M <omair.m.abdullah@xxxxxxxxx> - * Jin, Yao <yao.jin@xxxxxxxxx> - * Lin, Mengdong <mengdong.lin@xxxxxxxxx> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * Add support to read audio firmware topology alongside firmware text. The - * topology data can contain kcontrols, DAPM graphs, widgets, DAIs, DAI links, - * equalizers, firmware, coefficients etc. - * - * This file only manages the core ALSA and ASoC components, all other bespoke - * firmware topology data is passed to component drivers for bespoke handling. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// soc-topology.c -- ALSA SoC Topology +// +// Copyright (C) 2012 Texas Instruments Inc. +// Copyright (C) 2015 Intel Corporation. +// +// Authors: Liam Girdwood <liam.r.girdwood@xxxxxxxxxxxxxxx> +// K, Mythri P <mythri.p.k@xxxxxxxxx> +// Prusty, Subhransu S <subhransu.s.prusty@xxxxxxxxx> +// B, Jayachandran <jayachandran.b@xxxxxxxxx> +// Abdullah, Omair M <omair.m.abdullah@xxxxxxxxx> +// Jin, Yao <yao.jin@xxxxxxxxx> +// Lin, Mengdong <mengdong.lin@xxxxxxxxx> +// +// Add support to read audio firmware topology alongside firmware text. The +// topology data can contain kcontrols, DAPM graphs, widgets, DAIs, DAI links, +// equalizers, firmware, coefficients etc. +// +// This file only manages the core ALSA and ASoC components, all other bespoke +// firmware topology data is passed to component drivers for bespoke handling. #include <linux/kernel.h> #include <linux/export.h> -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
