]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2016 19:10:02 +0000 (12:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2016 19:10:02 +0000 (12:10 -0700)
Merge filesystem stacking fixes from Jann Horn.

* emailed patches from Jann Horn <jannh@google.com>:
  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