diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-03 04:14:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-03 04:14:02 +0300 |
| commit | fcaa0ad72d8a14736595bb48c49f9ebd62963d63 (patch) | |
| tree | 75e8456176a3ee1976467eb4f4466dcd245255ff /arch/um/Kconfig | |
| parent | e3a251e366e1a007c7ce7b2809b67f4dece6b17c (diff) | |
| parent | 9807019a62dc670c73ce8e59e09b41ae458c34b3 (diff) | |
| download | linux-fcaa0ad72d8a14736595bb48c49f9ebd62963d63.tar.xz | |
Merge tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Fixes for our new virtio code
- Fix for the irqflags tracer
- Kconfig coding style fixes
- Allow BPF firmware loading in our vector driver
* tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Loadable BPF "Firmware" for vector drivers
um: Fix Kconfig indentation
um: virtio_uml: Disallow modular build
um: virtio: Keep reading on -EAGAIN
um: virtio: Remove device on disconnect
um: Don't trace irqflags during shutdown
Diffstat (limited to 'arch/um/Kconfig')
| -rw-r--r-- | arch/um/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index fec6b4ca2b6e..2a6d04fcb3e9 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -153,7 +153,7 @@ config KERNEL_STACK_ORDER It is possible to reduce the stack to 1 for 64BIT and 0 for 32BIT on older (pre-2017) CPUs. It is not recommended on newer CPUs due to the increase in the size of the state which needs to be saved when handling - signals. + signals. config MMAPPER tristate "iomem emulation driver" |