tree c66010150a6cc66df6ab0339f08cee3d623d78c7
parent bfb7bfef6f9e8f113b892070fd622ae1c52e676b
parent d17af5056cf9e9fc05e68832f7c15687fcc12281
author Linus Torvalds <torvalds@linux-foundation.org> 1477154350 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1477154350 -0700

Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull vmap stack fixes from Ingo Molnar:
 "This is fallout from CONFIG_HAVE_ARCH_VMAP_STACK=y on x86: stack
  accesses that used to be just somewhat questionable are now totally
  buggy.

  These changes try to do it without breaking the ABI: the fields are
  left there, they are just reporting zero, or reporting narrower
  information (the maps file change)"

* 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  mm: Change vm_is_stack_for_task() to vm_is_stack_for_current()
  fs/proc: Stop trying to report thread stacks
  fs/proc: Stop reporting eip and esp in /proc/PID/stat
  mm/numa: Remove duplicated include from mprotect.c