From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Feb 2012 23:28:56 +0000 (-0800)
Subject: Merge tag 'ecryptfs-3.3-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~3516
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4686066689482214781573fcb42300f713d0210c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'ecryptfs-3.3-rc4-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Fixes maximum filename length and filesystem type reporting in statfs() calls
and also fixes stale inode mode bits on eCryptfs inodes after a POSIX ACL was
set on the lower filesystem's inode.

* tag 'ecryptfs-3.3-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: remove the second argument of k[un]map_atomic()
  eCryptfs: Copy up lower inode attrs after setting lower xattr
  eCryptfs: Improve statfs reporting
---

4686066689482214781573fcb42300f713d0210c