From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 10 Nov 2016 14:27:04 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-92~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7377c22beb9d73e5dd6a5368232619b48c7bcbf2;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/upstream-cherry-picks:
  ecryptfs: don't allow mmap when the lower fs doesn't support it
  Revert "ecryptfs: forbid opening files without mmap handler"
---

7377c22beb9d73e5dd6a5368232619b48c7bcbf2