diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 18:29:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 18:29:25 -0800 |
| commit | fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e (patch) | |
| tree | 5005f612c8bb682fa621d6d3f8b75897e71590af /init | |
| parent | a78416d97425551b6790dc56626ac5c87415f3fc (diff) | |
| parent | d65197ad52494bed3b5e64708281b8295f76c391 (diff) | |
| download | linux-fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e.tar.bz2 | |
Merge tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Anton Ivanov:
"I am sending this on behalf of Richard who is traveling.
This contains the following changes for UML:
- Fix for time travel mode
- Disable CONFIG_CONSTRUCTORS again
- A new command line option to have an non-raw serial line
- Preparations to remove obsolete UML network drivers"
* tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix time-travel=inf-cpu with xor/raid6
Revert "um: Enable CONFIG_CONSTRUCTORS"
um: Mark non-vector net transports as obsolete
um: Add an option to make serial driver non-raw
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 303b41369181..24b23d843df1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -54,6 +54,7 @@ config CC_DISABLE_WARN_MAYBE_UNINITIALIZED config CONSTRUCTORS bool + depends on !UML config IRQ_WORK bool |