From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Dec 2020 01:56:44 +0000 (-0800)
Subject: Merge tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=345b17acb1aa7a443741d9220f66b30d5ddd7c39;p=linux.git

Merge tag 'for-linus-5.11-rc1' of git://git./linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:

 - IRQ handling cleanups

 - Support for suspend

 - Various fixes for UML specific drivers: ubd, vector, xterm

* tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (32 commits)
  um: Fix build w/o CONFIG_PM_SLEEP
  um: time-travel: Correct time event IRQ delivery
  um: irq/sigio: Support suspend/resume handling of workaround IRQs
  um: time-travel: Actually apply "free-until" optimisation
  um: chan_xterm: Fix fd leak
  um: tty: Fix handling of close in tty lines
  um: Monitor error events in IRQ controller
  um: allocate a guard page to helper threads
  um: support some of ARCH_HAS_SET_MEMORY
  um: time-travel: avoid multiple identical propagations
  um: Fetch registers only for signals which need them
  um: Support suspend to RAM
  um: Allow PM with suspend-to-idle
  um: time: Fix read_persistent_clock64() in time-travel
  um: Simplify os_idle_sleep() and sleep longer
  um: Simplify IRQ handling code
  um: Remove IRQ_NONE type
  um: irq: Reduce irq_reg allocation
  um: irq: Clean up and rename struct irq_fd
  um: Clean up alarm IRQ chip name
  ...
---

345b17acb1aa7a443741d9220f66b30d5ddd7c39
diff --cc arch/um/Kconfig
index 43333e36e0bae,70ee19cc6ec68..34d302d1a07ff
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -15,8 -15,10 +15,9 @@@ config UM
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DEBUG_BUGVERBOSE
  	select NO_DMA
+ 	select ARCH_HAS_SET_MEMORY
  	select GENERIC_IRQ_SHOW
  	select GENERIC_CPU_DEVICES
 -	select GENERIC_CLOCKEVENTS
  	select HAVE_GCC_PLUGINS
  	select SET_FS
  	select TTY # Needed for line.c