From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 17:45:15 +0000 (-0700)
Subject: Merge tag 'usercopy-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5958cc49ed2961a059d92ae55afeeaba64a783a0;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'usercopy-v4.12-rc1' of git://git./linux/kernel/git/kees/linux

Pull hardened usercopy updates from Kees Cook:
 "A couple hardened usercopy changes:

   - drop now unneeded is_vmalloc_or_module() check (Laura Abbott)

   - use enum instead of literals for stack frame API (Sahara)"

* tag 'usercopy-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  mm/usercopy: Drop extra is_vmalloc_or_module() check
  usercopy: Move enum for arch_within_stack_frames()
---

5958cc49ed2961a059d92ae55afeeaba64a783a0