| commit | c8b4ec8351d21da3299b045b37920e5cf5590793 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 02 18:32:59 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 02 18:32:59 2017 -0800 |
| tree | 24143a2a29a0577df09857478a0c56794b46dfd7 | |
| parent | da2875673660c114dc7d65edcd1f97023d0ed624 [diff] | |
| parent | 42d97eb0ade31e1bc537d086842f5d6e766d9d51 [diff] |
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