Merge tag 'v5.2-rc2' into patchwork

Merge back from upstream into media tree, as there are some
patches merged upstream that has pontential of causing
conflicts (one actually rised a conflict already).

Linux 5.2-rc2

* tag 'v5.2-rc2': (377 commits)
  Linux 5.2-rc2
  random: fix soft lockup when trying to read from an uninitialized blocking pool
  tracing: Silence GCC 9 array bounds warning
  ext4: fix dcache lookup of !casefolded directories
  locking/lock_events: Use this_cpu_add() when necessary
  KVM: x86: fix return value for reserved EFER
  tools/kvm_stat: fix fields filter for child events
  KVM: selftests: Wrap vcpu_nested_state_get/set functions with x86 guard
  kvm: selftests: aarch64: compile with warnings on
  kvm: selftests: aarch64: fix default vm mode
  kvm: selftests: aarch64: dirty_log_test: fix unaligned memslot size
  KVM: s390: fix memory slot handling for KVM_SET_USER_MEMORY_REGION
  KVM: x86/pmu: do not mask the value that is written to fixed PMUs
  KVM: x86/pmu: mask the result of rdpmc according to the width of the counters
  x86/kvm/pmu: Set AMD's virt PMU version to 1
  KVM: x86: do not spam dmesg with VMCS/VMCB dumps
  kvm: Check irqchip mode before assign irqfd
  kvm: svm/avic: fix off-by-one in checking host APIC ID
  KVM: selftests: do not blindly clobber registers in guest asm
  KVM: selftests: Remove duplicated TEST_ASSERT in hyperv_cpuid.c
  ...

diff --cc drivers/media/Kconfig
Simple merge

diff --cc drivers/media/dvb-core/Kconfig
Simple merge

diff --cc drivers/media/i2c/Kconfig
Simple merge

diff --cc drivers/media/pci/ddbridge/Kconfig
Simple merge

diff --cc drivers/media/pci/dt3155/Kconfig
Simple merge

diff --cc drivers/media/pci/ivtv/Kconfig
Simple merge

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/platform/coda/Makefile
index 3eed821372576b6d8789550cfacfeb0165d7244d,f13adacd924ea24b63665b1ce92e357a7fe4b352..e17875e4343c494130794cb3fe29c5ff45187b4f
--- 1/drivers/media/platform/coda/Makefile
--- 2/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@@ -1,3 -1,6 +1,5 @@@
 -ccflags-y += -I$(src)
+ # SPDX-License-Identifier: GPL-2.0-only
+ 
  coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
  
  obj-$(CONFIG_VIDEO_CODA) += coda.o

diff --cc drivers/media/platform/omap/Kconfig
Simple merge

diff --cc drivers/media/platform/vicodec/Kconfig
Simple merge

diff --cc drivers/media/platform/vimc/Kconfig
Simple merge

diff --cc drivers/media/platform/vivid/Kconfig
Simple merge

diff --cc drivers/media/radio/Kconfig
Simple merge

diff --cc drivers/media/spi/Kconfig
Simple merge

diff --cc drivers/media/tuners/Kconfig
Simple merge

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

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

diff --cc drivers/media/usb/s2255/Kconfig
Simple merge

diff --cc drivers/media/v4l2-core/Kconfig
Simple merge