From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Sep 2021 20:45:26 +0000 (-0700)
Subject: Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: microblaze-v5.16~38
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=d6c338a741295c04ed84679153448b2fffd2c9cf

Merge tag 'for-linus-5.15-rc1' of git://git./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
---

d6c338a741295c04ed84679153448b2fffd2c9cf
diff --cc arch/um/Kconfig
index 8de2646fbdb1,389c9f5bcb2b..c18b45f75d41
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -22,8 -20,8 +22,9 @@@ config UM
  	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