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

diff --combined init/Kconfig
index 303b413,47d40f3..24b23d8
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -54,11 -54,12 +54,12 @@@ config CC_DISABLE_WARN_MAYBE_UNINITIALI
  
  config CONSTRUCTORS
        bool
+       depends on !UML
  
  config IRQ_WORK
        bool
  
 -config BUILDTIME_EXTABLE_SORT
 +config BUILDTIME_TABLE_SORT
        bool
  
  config THREAD_INFO_IN_TASK
@@@ -1080,14 -1081,6 +1081,14 @@@ config UTS_N
          In this namespace tasks see different info provided with the
          uname() system call
  
 +config TIME_NS
 +      bool "TIME namespace"
 +      depends on GENERIC_VDSO_TIME_NS
 +      default y
 +      help
 +        In this namespace boottime and monotonic clocks can be set.
 +        The time will keep going with the same pace.
 +
  config IPC_NS
        bool "IPC namespace"
        depends on (SYSVIPC || POSIX_MQUEUE)
@@@ -1612,9 -1605,6 +1613,9 @@@ config BPF_SYSCAL
          Enable the bpf() system call that allows to manipulate eBPF
          programs and maps via file descriptors.
  
 +config ARCH_WANT_DEFAULT_BPF_JIT
 +      bool
 +
  config BPF_JIT_ALWAYS_ON
        bool "Permanently enable BPF JIT and remove BPF interpreter"
        depends on BPF_SYSCALL && HAVE_EBPF_JIT && BPF_JIT
@@@ -1622,10 -1612,6 +1623,10 @@@
          Enables BPF JIT and removes BPF interpreter to avoid
          speculative execution of BPF instructions by the interpreter
  
 +config BPF_JIT_DEFAULT_ON
 +      def_bool ARCH_WANT_DEFAULT_BPF_JIT || BPF_JIT_ALWAYS_ON
 +      depends on HAVE_EBPF_JIT && BPF_JIT
 +
  config USERFAULTFD
        bool "Enable userfaultfd() system call"
        depends on MMU