From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Jul 2021 17:19:13 +0000 (-0700)
Subject: Merge tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v5.14-rc1~34
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/dcf3c935dd9e8e76c9922e88672fa4ad6a8a4df8

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

Pull UML updates from Richard Weinberger:

 - Support for optimized routines based on the host CPU

 - Support for PCI via virtio

 - Various fixes

* tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: remove unneeded semicolon in um_arch.c
  um: Remove the repeated declaration
  um: fix error return code in winch_tramp()
  um: fix error return code in slip_open()
  um: Fix stack pointer alignment
  um: implement flush_cache_vmap/flush_cache_vunmap
  um: add a UML specific futex implementation
  um: enable the use of optimized xor routines in UML
  um: Add support for host CPU flags and alignment
  um: allow not setting extra rpaths in the linux binary
  um: virtio/pci: enable suspend/resume
  um: add PCI over virtio emulation driver
  um: irqs: allow invoking time-travel handler multiple times
  um: time-travel/signals: fix ndelay() in interrupt
  um: expose time-travel mode to userspace side
  um: export signals_enabled directly
  um: remove unused smp_sigio_handler() declaration
  lib: add iomem emulation (logic_iomem)
  um: allow disabling NO_IOMEM
---

dcf3c935dd9e8e76c9922e88672fa4ad6a8a4df8
diff --cc arch/um/kernel/um_arch.c
index 9512253947d5,0a7eb104850a..a149a5e9a16a
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@@ -6,8 -6,8 +6,9 @@@
  #include <linux/delay.h>
  #include <linux/init.h>
  #include <linux/mm.h>
+ #include <linux/ctype.h>
  #include <linux/module.h>
 +#include <linux/panic_notifier.h>
  #include <linux/seq_file.h>
  #include <linux/string.h>
  #include <linux/utsname.h>