From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jul 2013 22:11:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
X-Git-Tag: v4.13~9104
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d471ce53b1fab60110e4e9f647a345cea31752de;p=mirror_ubuntu-bionic-kernel.git

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

Pull UML fixes from Richard Weinberger:
 "Special thanks goes to Toralf Föster for continuously testing UML and
  reporting issues!"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: remove dead code
  um: siginfo cleanup
  uml: Fix which_tmpdir failure when /dev/shm is a symlink, and in other edge cases
  um: Fix wait_stub_done() error handling
  um: Mark stub pages mapping with VM_PFNMAP
  um: Fix return value of strnlen_user()
---

d471ce53b1fab60110e4e9f647a345cea31752de