Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:

 - Support for VMAP_STACK

 - Support for splice_write in hostfs

 - Fixes for virt-pci

 - Fixes for virtio_uml

 - Various fixes

* tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: fix stub location calculation
  um: virt-pci: fix uapi documentation
  um: enable VMAP_STACK
  um: virt-pci: don't do DMA from stack
  hostfs: support splice_write
  um: virtio_uml: fix memory leak on init failures
  um: virtio_uml: include linux/virtio-uml.h
  lib/logic_iomem: fix sparse warnings
  um: make PCI emulation driver init/exit static

diff --combined arch/um/Kconfig
index 8de2646,389c9f5..c18b45f
--- 1/arch/um/Kconfig
--- 2/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -7,8 -7,6 +7,8 @@@ config UM
        default y
        select ARCH_EPHEMERAL_INODES
        select ARCH_HAS_KCOV
 +      select ARCH_HAS_STRNCPY_FROM_USER
 +      select ARCH_HAS_STRNLEN_USER
        select ARCH_NO_PREEMPT
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_SECCOMP_FILTER
@@@ -22,8 -20,8 +22,9 @@@
        select GENERIC_CPU_DEVICES
        select HAVE_GCC_PLUGINS
        select SET_FS
 +      select TRACE_IRQFLAGS_SUPPORT
        select TTY # Needed for line.c
+       select HAVE_ARCH_VMAP_STACK
  
  config MMU
        bool
@@@ -53,6 -51,10 +54,6 @@@ config IS
  config SBUS
        bool
  
 -config TRACE_IRQFLAGS_SUPPORT
 -      bool
 -      default y
 -
  config LOCKDEP_SUPPORT
        bool
        default y