Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Bugfixes all over the place"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-vdpa: fix use after free in vhost_vdpa_probe()
  virtio_pci: Switch away from deprecated irq_set_affinity_hint
  riscv, qemu_fw_cfg: Add support for RISC-V architecture
  vdpa_sim_blk: allocate the buffer zeroed
  virtio_pci: move structure to a header

diff --combined drivers/firmware/Kconfig
index 74d00b0,f05ff56..4a98a85
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -77,6 -77,30 +77,6 @@@ config FIRMWARE_MEMMA
  
        See also Documentation/ABI/testing/sysfs-firmware-memmap.
  
 -config EFI_PCDP
 -      bool "Console device selection via EFI PCDP or HCDP table"
 -      depends on ACPI && EFI && IA64
 -      default y if IA64
 -      help
 -        If your firmware supplies the PCDP table, and you want to
 -        automatically use the primary console device it describes
 -        as the Linux console, say Y here.
 -
 -        If your firmware supplies the HCDP table, and you want to
 -        use the first serial port it describes as the Linux console,
 -        say Y here.  If your EFI ConOut path contains only a UART
 -        device, it will become the console automatically.  Otherwise,
 -        you must specify the "console=hcdp" kernel boot argument.
 -
 -        Neither the PCDP nor the HCDP affects naming of serial devices,
 -        so a serial console may be /dev/ttyS0, /dev/ttyS1, etc, depending
 -        on how the driver discovers devices.
 -
 -        You must also enable the appropriate drivers (serial, VGA, etc.)
 -
 -        See DIG64_HCDPv20_042804.pdf available from
 -        <http://www.dig64.org/specifications/> 
 -
  config DMIID
      bool "Export DMI identification via sysfs to userspace"
      depends on DMI
@@@ -131,7 -155,7 +131,7 @@@ config RASPBERRYPI_FIRMWAR
  
  config FW_CFG_SYSFS
        tristate "QEMU fw_cfg device support in sysfs"
-       depends on SYSFS && (ARM || ARM64 || PARISC || PPC_PMAC || SPARC || X86)
+       depends on SYSFS && (ARM || ARM64 || PARISC || PPC_PMAC || RISCV || SPARC || X86)
        depends on HAS_IOPORT_MAP
        default n
        help
@@@ -188,6 -212,20 +188,6 @@@ config MTK_ADSP_IP
          ADSP exists on some mtk processors.
          Client might use shared memory to exchange information with ADSP.
  
 -config QCOM_SCM
 -      tristate
 -
 -config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
 -      bool "Qualcomm download mode enabled by default"
 -      depends on QCOM_SCM
 -      help
 -        A device with "download mode" enabled will upon an unexpected
 -        warm-restart enter a special debug mode that allows the user to
 -        "download" memory content over USB for offline postmortem analysis.
 -        The feature can be enabled/disabled on the kernel command line.
 -
 -        Say Y here to enable "download mode" by default.
 -
  config SYSFB
        bool
        select BOOT_VESA_SUPPORT
@@@ -273,7 -311,6 +273,7 @@@ source "drivers/firmware/efi/Kconfig
  source "drivers/firmware/imx/Kconfig"
  source "drivers/firmware/meson/Kconfig"
  source "drivers/firmware/psci/Kconfig"
 +source "drivers/firmware/qcom/Kconfig"
  source "drivers/firmware/smccc/Kconfig"
  source "drivers/firmware/tegra/Kconfig"
  source "drivers/firmware/xilinx/Kconfig"