From: Linus Torvalds Date: Mon, 21 Jul 2014 03:28:04 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cfad81ce28b6d47fbc7c8afabd3ab16d9a8499e9;p=deliverable%2Flinux.git Merge branch 'for-linus' of git://git./linux/kernel/git/rw/uml Pull UML fixes from Richard Weinberger: "Four fixes, all discovered by Trinity" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: segv: Save regs only in case of a kernel mode fault um: Fix hung task in fix_range_common() um: Ensure that a stub page cannot get unmapped Revert "um: Fix wait_stub_done() error handling" --- cfad81ce28b6d47fbc7c8afabd3ab16d9a8499e9