Merge tag 'v5.2-rc4' into media/master

There are some conflicts due to SPDX changes. We also have more
patches being merged via media tree touching them.

So, let's merge back from upstream and address those.

Linux 5.2-rc4

* tag 'v5.2-rc4': (767 commits)
  Linux 5.2-rc4
  MAINTAINERS: Karthikeyan Ramasubramanian is MIA
  i2c: xiic: Add max_read_len quirk
  lockref: Limit number of cmpxchg loop retries
  uaccess: add noop untagged_addr definition
  x86/insn-eval: Fix use-after-free access to LDT entry
  kbuild: use more portable 'command -v' for cc-cross-prefix
  s390/unwind: correct stack switching during unwind
  block, bfq: add weight symlink to the bfq.weight cgroup parameter
  cgroup: let a symlink too be created with a cftype file
  drm/nouveau/secboot/gp10[2467]: support newer FW to fix SEC2 failures on some boards
  drm/nouveau/secboot: enable loading of versioned LS PMU/SEC2 ACR msgqueue FW
  drm/nouveau/secboot: split out FW version-specific LS function pointers
  drm/nouveau/secboot: pass max supported FW version to LS load funcs
  drm/nouveau/core: support versioned firmware loading
  drm/nouveau/core: pass subdev into nvkm_firmware_get, rather than device
  block: free sched's request pool in blk_cleanup_queue
  pktgen: do not sleep with the thread lock held.
  net: mvpp2: Use strscpy to handle stat strings
  net: rds: fix memory leak in rds_ib_flush_mr_pool
  ...

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/dvb-frontends/si2168.c
Simple merge

diff --cc drivers/media/i2c/cx25840/cx25840-core.c
index f071a94,3ecf79d..0de946f
--- 1/drivers/media/i2c/cx25840/cx25840-core.c
--- 2/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@@ -20,21 -21,9 +21,11 @@@
   *
   * CX23888 DIF support for the HVR1850
   * Copyright (C) 2011 Steven Toth <stoth@kernellabs.com>
-  *
-  * 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.
-  *
-  * 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.
 + *
 + * CX2584x pin to pad mapping and output format configuration support are
 + * Copyright (C) 2011 Maciej S. Szmigiero <mail@maciej.szmigiero.name>
   */
  
 -
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/slab.h>

diff --cc drivers/media/i2c/cx25840/cx25840-core.h
Simple merge

diff --cc drivers/media/i2c/cx25840/cx25840-vbi.c
Simple merge

diff --cc drivers/media/i2c/smiapp/smiapp-quirk.c
Simple merge

diff --cc drivers/media/mc/mc-device.c
Simple merge

diff --cc drivers/media/mc/mc-devnode.c
Simple merge

diff --cc drivers/media/mc/mc-entity.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-dvb.c
Simple merge

diff --cc drivers/media/pci/saa7164/saa7164-core.c
Simple merge

diff --cc drivers/media/platform/atmel/atmel-isc.c
Simple merge

diff --cc drivers/media/platform/coda/coda-bit.c
Simple merge

diff --cc drivers/media/platform/coda/coda-common.c
Simple merge

diff --cc drivers/media/platform/coda/coda-h264.c
Simple merge

diff --cc drivers/media/platform/coda/coda.h
Simple merge

diff --cc drivers/media/platform/coda/coda_regs.h
Simple merge

diff --cc drivers/media/platform/davinci/vpss.c
Simple merge

diff --cc drivers/media/platform/exynos-gsc/gsc-core.c
Simple merge

diff --cc drivers/media/platform/exynos-gsc/gsc-m2m.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-m2m.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/media-dev.c
Simple merge

diff --cc drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
Simple merge

diff --cc drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
Simple merge

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index aee1ddc,7ae588e..90d1a67
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  *         Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <media/v4l2-event.h>
  #include <media/v4l2-mem2mem.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
index a182686,3861d44..e0c5338
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
@@@ -1,4 -1,9 +1,9 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  *         Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _MTK_VCODEC_DEC_H_
  #define _MTK_VCODEC_DEC_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index dbe957a,372d378..00d090d
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  *         Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <linux/slab.h>
  #include <linux/interrupt.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index b09242b,273f78f..5a6ec8f
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <linux/clk.h>
  #include <linux/of_address.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
index b44621a,74555cc..872d8bf
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _MTK_VCODEC_DEC_PM_H_
  #define _MTK_VCODEC_DEC_PM_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 7306aea,1044176..c142273
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@@ -1,4 -1,9 +1,9 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *         Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #ifndef _MTK_VCODEC_DRV_H_
  #define _MTK_VCODEC_DRV_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 67e8a02,0cf5744..480cc8f
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *         Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #include <media/v4l2-event.h>
  #include <media/v4l2-mem2mem.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
index e372e5d,8248cb6..a9c9f86
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
@@@ -1,4 -1,9 +1,9 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *         Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #ifndef _MTK_VCODEC_ENC_H_
  #define _MTK_VCODEC_ENC_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
index b6d7c60,b15e9d2..1d82aa2
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *     Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #include <linux/slab.h>
  #include <linux/interrupt.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
index 90bdad5,4740ae5..3e2bfde
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #include <linux/clk.h>
  #include <linux/of_address.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
index dddbbe0,63165fc..b7ecdfd
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #ifndef _MTK_VCODEC_ENC_PM_H_
  #define _MTK_VCODEC_ENC_PM_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
index 693888e,f8aae7c..a3c7a38
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #include <linux/errno.h>
  #include <linux/wait.h>

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
index 55f046c,ba63252..638cd1f
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #ifndef _MTK_VCODEC_INTR_H_
  #define _MTK_VCODEC_INTR_H_

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
index e1a9ac9,13f7061..d48f542
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *     Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #include <linux/module.h>
  

diff --cc drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
index daabb63,677adb9..b999d7b
--- 1/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
--- 2/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
@@@ -1,4 -1,9 +1,9 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+ * Copyright (c) 2016 MediaTek Inc.
+ * Author: PC Chen <pc.chen@mediatek.com>
+ *     Tiffany Lin <tiffany.lin@mediatek.com>
+ */
  
  #ifndef _MTK_VCODEC_UTIL_H_
  #define _MTK_VCODEC_UTIL_H_

diff --cc drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
index d725ea5,455dbe4..c035f74
--- 1/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
--- 2/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  */
  
  #include <linux/module.h>
  #include <linux/slab.h>

diff --cc drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
index 8de9978,91139ce..24f976f
--- 1/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
--- 2/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *       PC Chen <pc.chen@mediatek.com>
+  */
  
  #include <linux/slab.h>
  #include "../vdec_drv_if.h"

diff --cc drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
index 02b6529,c1904ad..9e6b630
--- 1/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
--- 2/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
@@@ -1,4 -1,10 +1,10 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *    Kai-Sean Yang <kai-sean.yang@mediatek.com>
+  *    Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <linux/fs.h>
  #include <linux/slab.h>

diff --cc drivers/media/platform/mtk-vcodec/vdec_drv_base.h
index 014712b,b6cb922..2019aec
--- 1/drivers/media/platform/mtk-vcodec/vdec_drv_base.h
--- 2/drivers/media/platform/mtk-vcodec/vdec_drv_base.h
+++ b/drivers/media/platform/mtk-vcodec/vdec_drv_base.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  */
  
  #ifndef _VDEC_DRV_BASE_
  #define _VDEC_DRV_BASE_

diff --cc drivers/media/platform/mtk-vcodec/vdec_drv_if.c
index 6835cb7,5c98a76..bd42d90
--- 1/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
--- 2/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec_drv_if.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  *         Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <linux/interrupt.h>
  #include <linux/kernel.h>

diff --cc drivers/media/platform/mtk-vcodec/vdec_drv_if.h
index ceba7f5,4096235..c5bd8b0
--- 1/drivers/media/platform/mtk-vcodec/vdec_drv_if.h
--- 2/drivers/media/platform/mtk-vcodec/vdec_drv_if.h
+++ b/drivers/media/platform/mtk-vcodec/vdec_drv_if.h
@@@ -1,4 -1,9 +1,9 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  *               Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _VDEC_DRV_IF_H_
  #define _VDEC_DRV_IF_H_

diff --cc drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
index 6370f12,b05dcde..47a1c1c
--- 1/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
--- 2/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
+++ b/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  */
  
  #ifndef _VDEC_IPI_MSG_H_
  #define _VDEC_IPI_MSG_H_

diff --cc drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
index 9b240d3,035ba91..3f38cc4
--- 1/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
--- 2/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
+++ b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  */
  
  #include "mtk_vcodec_drv.h"
  #include "mtk_vcodec_util.h"

diff --cc drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
index 3c41749,6701778..b76f717
--- 1/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
--- 2/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
+++ b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PC Chen <pc.chen@mediatek.com>
+  */
  
  #ifndef _VDEC_VPU_IF_H_
  #define _VDEC_VPU_IF_H_

diff --cc drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
index 0cf08dd,3125eaf..21f2eae
--- 1/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
--- 2/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
@@@ -1,4 -1,10 +1,10 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *         Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *         PoChun Lin <pochun.lin@mediatek.com>
+  */
  
  #include <linux/interrupt.h>
  #include <linux/kernel.h>

diff --cc drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
index 3fb9e0c,ba19cdc..81f87f6
--- 1/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
--- 2/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
@@@ -1,4 -1,9 +1,9 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *         PoChun Lin <pochun.lin@mediatek.com>
+  */
  
  #include <linux/interrupt.h>
  #include <linux/kernel.h>

diff --cc drivers/media/platform/mtk-vcodec/venc_drv_base.h
index 2de37b4,8162068..09968a6
--- 1/drivers/media/platform/mtk-vcodec/venc_drv_base.h
--- 2/drivers/media/platform/mtk-vcodec/venc_drv_base.h
+++ b/drivers/media/platform/mtk-vcodec/venc_drv_base.h
@@@ -1,4 -1,10 +1,10 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *    Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *    Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _VENC_DRV_BASE_
  #define _VENC_DRV_BASE_

diff --cc drivers/media/platform/mtk-vcodec/venc_drv_if.c
index 25c1e10,608c08b..600c43c
--- 1/drivers/media/platform/mtk-vcodec/venc_drv_if.c
--- 2/drivers/media/platform/mtk-vcodec/venc_drv_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_drv_if.c
@@@ -1,4 -1,10 +1,10 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *    Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *    Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #include <linux/interrupt.h>
  #include <linux/kernel.h>

diff --cc drivers/media/platform/mtk-vcodec/venc_drv_if.h
index d660581,bbba1ce..cc5bb36
--- 1/drivers/media/platform/mtk-vcodec/venc_drv_if.h
--- 2/drivers/media/platform/mtk-vcodec/venc_drv_if.h
+++ b/drivers/media/platform/mtk-vcodec/venc_drv_if.h
@@@ -1,4 -1,10 +1,10 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *            Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *            Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _VENC_DRV_IF_H_
  #define _VENC_DRV_IF_H_

diff --cc drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
index d5282f2,be34780..28ee04c
--- 1/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
--- 2/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
+++ b/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
@@@ -1,4 -1,10 +1,10 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: Jungchang Tsao <jungchang.tsao@mediatek.com>
+  *       Daniel Hsiao <daniel.hsiao@mediatek.com>
+  *       Tiffany Lin <tiffany.lin@mediatek.com>
+  */
  
  #ifndef _VENC_IPI_MSG_H_
  #define _VENC_IPI_MSG_H_

diff --cc drivers/media/platform/mtk-vcodec/venc_vpu_if.c
index a6906db,7daf869..3e931b0
--- 1/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
--- 2/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
@@@ -1,4 -1,8 +1,8 @@@
 -// SPDX-License-Identifier: GPL-2.0-only
 +// SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PoChun Lin <pochun.lin@mediatek.com>
+  */
  
  #include "mtk_vpu.h"
  #include "venc_ipi_msg.h"

diff --cc drivers/media/platform/mtk-vcodec/venc_vpu_if.h
index fd4f856,a6b6d0e..ba301a1
--- 1/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
--- 2/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
+++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
@@@ -1,4 -1,8 +1,8 @@@
 -/* SPDX-License-Identifier: GPL-2.0-only */
 +/* SPDX-License-Identifier: GPL-2.0 */
+ /*
+  * Copyright (c) 2016 MediaTek Inc.
+  * Author: PoChun Lin <pochun.lin@mediatek.com>
+  */
  
  #ifndef _VENC_VPU_IF_H_
  #define _VENC_VPU_IF_H_

diff --cc drivers/media/platform/mtk-vpu/mtk_vpu.c
Simple merge

diff --cc drivers/media/platform/pxa_camera.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/core.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/firmware.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/helpers.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/hfi_cmds.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/vdec.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/vdec_ctrls.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/venc.c
Simple merge

diff --cc drivers/media/platform/qcom/venus/venc_ctrls.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
Simple merge

diff --cc drivers/media/platform/vimc/vimc-core.c
Simple merge

diff --cc drivers/media/platform/vimc/vimc-debayer.c
Simple merge

diff --cc drivers/media/platform/vimc/vimc-scaler.c
Simple merge

diff --cc drivers/media/platform/vimc/vimc-sensor.c
Simple merge

diff --cc drivers/media/radio/dsbr100.c
Simple merge

diff --cc drivers/media/radio/radio-isa.c
Simple merge

diff --cc drivers/media/radio/radio-keene.c
Simple merge

diff --cc drivers/media/radio/radio-ma901.c
Simple merge

diff --cc drivers/media/radio/radio-mr800.c
Simple merge

diff --cc drivers/media/radio/radio-si476x.c
Simple merge

diff --cc drivers/media/radio/radio-tea5764.c
Simple merge

diff --cc drivers/media/radio/radio-tea5777.c
Simple merge

diff --cc drivers/media/radio/radio-timb.c
Simple merge

diff --cc drivers/media/radio/radio-wl1273.c
Simple merge

diff --cc drivers/media/radio/si470x/radio-si470x-i2c.c
Simple merge

diff --cc drivers/media/radio/si470x/radio-si470x-usb.c
Simple merge

diff --cc drivers/media/radio/si4713/radio-platform-si4713.c
Simple merge

diff --cc drivers/media/radio/tea575x.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/media/usb/airspy/airspy.c
Simple merge

diff --cc drivers/media/usb/au0828/au0828-core.c
Simple merge

diff --cc drivers/media/usb/au0828/au0828-video.c
Simple merge

diff --cc drivers/media/usb/cpia2/cpia2_usb.c
Simple merge

diff --cc drivers/media/usb/cpia2/cpia2_v4l.c
Simple merge

diff --cc drivers/media/usb/dvb-usb-v2/dvbsky.c
Simple merge

diff --cc drivers/media/usb/dvb-usb/cxusb.c
index cc61315,8039ba4..bac0778
--- 1/drivers/media/usb/dvb-usb/cxusb.c
--- 2/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@@ -15,12 -17,7 +16,8 @@@
   * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@posteo.de)
   * Copyright (C) 2006 Michael Krufky (mkrufky@linuxtv.org)
   * Copyright (C) 2006, 2007 Chris Pascoe (c.pascoe@itee.uq.edu.au)
 + * Copyright (C) 2011, 2017 Maciej S. Szmigiero (mail@maciej.szmigiero.name)
   *
-  *   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, version 2.
-  *
   * see Documentation/media/dvb-drivers/dvb-usb.rst for more information
   */
  #include <media/tuner.h>

diff --cc drivers/media/usb/dvb-usb/dvb-usb-init.c
Simple merge

diff --cc drivers/media/usb/go7007/go7007-v4l2.c
Simple merge

diff --cc drivers/media/usb/gspca/gspca.c
Simple merge

diff --cc drivers/media/usb/hackrf/hackrf.c
Simple merge

diff --cc drivers/media/usb/hdpvr/hdpvr-video.c
Simple merge

diff --cc drivers/media/usb/msi2500/msi2500.c
Simple merge

diff --cc drivers/media/usb/pwc/pwc-if.c
Simple merge

diff --cc drivers/media/usb/pwc/pwc-v4l.c
Simple merge

diff --cc drivers/media/usb/pwc/pwc.h
Simple merge

diff --cc drivers/media/usb/s2255/s2255drv.c
Simple merge

diff --cc drivers/media/usb/stk1160/stk1160-v4l.c
Simple merge

diff --cc drivers/media/usb/usbvision/usbvision-video.c
Simple merge

diff --cc drivers/media/usb/zr364xx/zr364xx.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ctrls.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-dev.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-fwnode.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-mem2mem.c
Simple merge

diff --cc include/media/v4l2-common.h
Simple merge

diff --cc include/media/v4l2-ctrls.h
Simple merge

diff --cc include/media/v4l2-mem2mem.h
Simple merge