]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 31 Oct 2016 22:52:23 +0000 (15:52 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 31 Oct 2016 22:52:23 +0000 (15:52 -0700)
* topic/uek-4.1/upstream-cherry-picks:
  sched: panic on corrupted stack end
  ecryptfs: forbid opening files without mmap handler
  proc: prevent stacking filesystems on top

1  2 
fs/proc/root.c
kernel/sched/core.c

diff --cc fs/proc/root.c
Simple merge
Simple merge