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 f071a9434fed9cf317cdb1400eef5ac556b963b5,3ecf79d242f27465d3d1969125f342221335f57b..0de946fe2109d796f5a0126a5fdddd3730b43ef8
--- 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 aee1ddc35de4ec47cf3b848455814e7808def186,7ae588e62ed8a509b7414075748c0184d458a36b..90d1a67db7e5f554f8e941e163b87969de850f2d
--- 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 a18268694646e9dd7680ed62adbdae86366b125d,3861d4433be917ff7aff19c376b2d359f4b0be0a..e0c5338bde3d3e11aac5bbe5de5fee6870cd9219
--- 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 dbe957aa138d2c463a3162ed2b0e133913e05f48,372d378243779e94ff0e47c0db1b1901bb7bce50..00d090df11bbe49361ace483c0070b581e798bdc
--- 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 b09242b1470de7ab26c8f70696817e97f17fe41a,273f78f129da22cd5ce04f7af1bfbf3aae907afb..5a6ec8fb52daab725975ba8094468ae707b17ac4
--- 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 b44621ad15d8482c7bc7e4f99c1f4464e9b95340,74555cc5a893d1e826971edf5ac245548c460099..872d8bf8cfaf3c6f1f20e2df129bf1482986a859
--- 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 7306aeabe2295a93fa7b273dd1da6168fed93abd,1044176d8e6f3ab13e94682e8c97db32fafcd70e..c1422739dab472af84bc5805985210f8f023e810
--- 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 67e8a023ef411731280e7fcb6bcf68fa7975b8c9,0cf5744b4c28a1ae547482b02a8e77d11d698848..480cc8fe281a50f520bdf6eda11582da92072678
--- 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 e372e5ddff8ace9423634edcaf257b1ddfe45f37,8248cb628882ce0ce76d61998d1515cd09bdb4d2..a9c9f86b9c8375aa33524c1509401b78b7bc02f7
--- 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 b6d7c602c2adeb66688a6f55de5ee43b6df83bc0,b15e9d2ef6a9d56a2192793b59dfe004060c1fb1..1d82aa2b6017c00ea5168fdf2972fd8d686cced4
--- 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 90bdad5c71b03b86e30875662c60dddd61d3ecca,4740ae5e9a8e872631b463e3d7fce74dc83d5108..3e2bfded79a66a1b38e2c0da652f2ca0136ebcc2
--- 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 dddbbe02a109d44379e220c63e3a6a37c3fd7608,63165fc1b84a23592d5f42c21b08784034d486a0..b7ecdfd74823bd978bd336f21f3dc9247a856b9c
--- 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 693888e4987fa5850e2932f37ad2dc5880e5100a,f8aae7cc5f575833aeabdc0aceb6a2356b77631b..a3c7a380c9308481256cfd5a97fdfb43050df0dc
--- 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 55f046cd93a581b3f7bc0767e491665714ea49d7,ba632528fa72a9f4c6ae4448648239a14bd23198..638cd1f3526af6b5754e82759375dfc486b94584
--- 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 e1a9ac9694e3daf07fb393995fc2833fb0ff5b87,13f7061bfb50c9d88e8ef64a8a51d64820c576e8..d48f542db1a914dc7c4ee321b368df9f9febc364
--- 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 daabb63548d07c319c859d21f18250c7de71922e,677adb990e288f6fac4fe02e433c8a43a25ba6c4..b999d7b84ed18d0d6bf753758ec89137f42e8e08
--- 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 d725ea54b1c1011f021ac8ebdb37ad34cdb4469d,455dbe4887c175dfc74b1d6e47c6c8ff574837be..c035f744b1f127e2586339b0aa875e2d9dab3d3f
--- 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 8de997875b6b4d91fb7cb914e17beab1b002468c,91139cef6283e880780726c6568cbf18f31c6904..24f976f0d477f2542289cce5657fd3fcdd42d0f7
--- 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 02b65298c87e2850aa003164152727fb7c276b94,c1904ad5e69bec373584c7ee60b54721d249869d..9e6b630d7f5ba3c86e3797e9e9a5b60cb538d4ef
--- 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 014712b1312e1681188e06729a90db5e8c71a25d,b6cb922fc40084a0351959977d0da12631b61062..2019aec71ddb753bed19eca9d4ca45dc8ef074e9
--- 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 6835cb7d090a45366675e0a0512833804bc3ca4a,5c98a76a77b7de56876fc568a3d0e4829027e4a1..bd42d9028c420a49f9626849e39301bc9fb62686
--- 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 ceba7f55a526c7aa6744e0ba683fa60303b0a5b2,409623574145f19f3294d77902854c04ead6e7d9..c5bd8b0dbe13d7c3cbdf17b1e2a1bccac109554f
--- 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 6370f1285a6312ac4c161d0cdf6e63183481ab32,b05dcdeb77341992ee9738766fd8150b502a4d06..47a1c1c0fd0426e25be23e9a27d8bf6fa2f54250
--- 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 9b240d325a84ffb4fa5fd223d8d3c37c9cc63b44,035ba917ed0e5fd24cf19f7045fd94a3e2ff4646..3f38cc4509efbf0b3f28fce74c6788f61fe10c54
--- 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 3c417493ccca83e8e1fddf53a88bb5fce592cf73,6701778ea5d97f49e4971e264d7ea22a646aefc0..b76f717e4fd71aa2d524ebe51ed039332fb18a3f
--- 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 0cf08dd7b6e3b2e9ef53e268065e2227b5285c25,3125eaf2a3263dd3fdb1b666b7bc4af90cfd0e8e..21f2eaea207b9287c1c49d514616e6af7ed13103
--- 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 3fb9e0c79b4f8f96133661a49e23a1bbaf219b2d,ba19cdc4e4f150bae26cbb88f6136a5823c9f440..81f87f6ec4355f4d168dfe8437422e0d9ad67bab
--- 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 2de37b47fe7343073bcd9fad7062e0366d7987f1,81620683b94f92da2ae41482f1a7e40b4fcb5c55..09968a68db4205879df19cd5bd993f0940e4276b
--- 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 25c1e100f5a1a3bcdcde6c91592f589deb4c0112,608c08b2ab8f77a0ef5519b739f23f6e9e3e14e4..600c43c17e48b7dfeeecea401a3068a9f4ec7281
--- 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 d6605812ebb017112e2bfe09a5050f49364b1f44,bbba1cec7be433f511546724e4cb47afb0a4ef6d..cc5bb36c273515040ded10ba726337aa6dfa074e
--- 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 d5282f24f9349d2772fe201faf42e16d36b94c76,be34780760f4341ab6d44a04215c2b165346bd13..28ee04ca62412a4f7977cd57263301696bcd5df6
--- 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 a6906db747180a1bef963107435fc5d7c0cacd80,7daf8694c62e2f2219c64e2ed25fcb296f814148..3e931b0ed09650b36314b2ed03e07c63c2f01afe
--- 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 fd4f85646aa52ff403998f80e55e9ceb248b0588,a6b6d0eafb50479b4d22151413afc6a226cd1e19..ba301a138a5afaa2a2614bda0a4826f3e6f09572
--- 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 cc61315b675c4769429c3d80556fe72ccc88c54d,8039ba4ebf6805bee70fe7cbce0c3749b2892245..bac0778f7defc1c653762def3f777d7294518bcc
--- 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