From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jan 2017 02:32:59 +0000 (-0800)
Subject: Merge tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c8b4ec8351d21da3299b045b37920e5cf5590793;p=linux-beck.git

Merge tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt

Pull fscrypt fixes from Ted Ts'o:
 "Two fscrypt bug fixes, one of which was unmasked by an update to the
  crypto tree during the merge window"

* tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: fix renaming and linking special files
  fscrypt: fix the test_dummy_encryption mount option
---

c8b4ec8351d21da3299b045b37920e5cf5590793