Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull UML fixes from Richard Weinberger:
 "No new stuff, just fixes"

* 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Add missing NR_CPUS include
  um: Fix to call read_initrd after init_bootmem
  um: Include kbuild.h instead of duplicating its macros
  um: Fix PTRACE_POKEUSER on x86_64
  um: Set number of CPUs
  um: Fix _print_addr()

diff --combined arch/um/Kconfig.common
index ed9c5b5,347bcd4..85f6dd2
--- 1/arch/um/Kconfig.common
--- 2/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@@ -50,6 -50,11 +50,6 @@@ config GENERIC_CALIBRATE_DELA
        bool
        default y
  
 -config GENERIC_BUG
 -      bool
 -      default y
 -      depends on BUG
 -
  config HZ
        int
        default 100
@@@ -57,3 -62,8 +57,8 @@@
  config SUBARCH
        string
        option env="SUBARCH"
+ 
+ config NR_CPUS
+       int
+       range 1 1
+       default 1