From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Nov 2017 21:20:41 +0000 (-0800)
Subject: Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.15-rc1~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbda1b270f7ac23665f25fa513d2a73ea7149cbe;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull cramfs updates from Al Viro:
 "Nicolas Pitre's cramfs work"

* 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cramfs: rehabilitate it
  cramfs: add mmap support
  cramfs: implement uncompressed and arbitrary data block positioning
  cramfs: direct memory access support
---

cbda1b270f7ac23665f25fa513d2a73ea7149cbe