]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a5544f 55a5161)
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Nov 2016 14:27:04 +0000 (06:27 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Nov 2016 14:27:04 +0000 (06:27 -0800)
* 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"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.