From: Mark Brown <broonie@kernel.org>
Date: Wed, 26 Jun 2019 11:39:34 +0000 (+0100)
Subject: Merge tag 'v5.2-rc6' into asoc-5.3
X-Git-Tag: v5.15~5427^2~39^2~105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53c8b29abe42e5601cfa0ea5962532f0cfdec8a0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v5.2-rc6' into asoc-5.3

Linux 5.2-rc6
---

53c8b29abe42e5601cfa0ea5962532f0cfdec8a0
diff --cc sound/soc/intel/boards/bxt_da7219_max98357a.c
index 0f7610c,1c4f4c1..c0d865a
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@@ -5,17 -6,9 +6,8 @@@
   *
   * Modified from:
   *   Intel Skylake I2S Machine driver
-  *
-  * 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.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   */
  
 -#include <asm/cpu_device_id.h>
  #include <linux/input.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
diff --cc sound/soc/stm/stm32_i2s.c
index 8846f49,01ed5e4..ba6452d
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@@ -3,20 -4,8 +4,9 @@@
   *
   * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
   * Author(s): Olivier Moysan <olivier.moysan@st.com> for STMicroelectronics.
-  *
-  * License terms: GPL V2.0.
-  *
-  * 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.
-  *
-  * This program is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-  * details.
   */
  
 +#include <linux/bitfield.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/module.h>
diff --cc sound/soc/stm/stm32_spdifrx.c
index 4a3fad4,56d7969..ee71b89
--- a/sound/soc/stm/stm32_spdifrx.c
+++ b/sound/soc/stm/stm32_spdifrx.c
@@@ -3,20 -4,8 +4,9 @@@
   *
   * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
   * Author(s): Olivier Moysan <olivier.moysan@st.com> for STMicroelectronics.
-  *
-  * License terms: GPL V2.0.
-  *
-  * 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.
-  *
-  * This program is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-  * details.
   */
  
 +#include <linux/bitfield.h>
  #include <linux/clk.h>
  #include <linux/completion.h>
  #include <linux/delay.h>
diff --cc sound/usb/bcd2000/Makefile
index 0a10031,9954607..e2d916e
--- a/sound/usb/bcd2000/Makefile
+++ b/sound/usb/bcd2000/Makefile
@@@ -1,3 -1,4 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  snd-bcd2000-y := bcd2000.o
  
 -obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o
 +obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o