tree ab60e0f2d21154dda05f58af310a66c94179d70a
parent 1251704a631b62591ad1d1b6ead252e9e597d5f5
parent ce4586063f1af780b1c6b7e344907e6f9c1ba59a
author Linus Torvalds <torvalds@linux-foundation.org> 1494696002 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1494696002 -0700

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

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()