projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da28756 42d97eb)
Merge tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jan 2017 02:32:59 +0000 (18:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jan 2017 02:32:59 +0000 (18:32 -0800)
commitc8b4ec8351d21da3299b045b37920e5cf5590793
tree24143a2a29a0577df09857478a0c56794b46dfd7tree | snapshot
parentda2875673660c114dc7d65edcd1f97023d0ed624commit | diff
parent42d97eb0ade31e1bc537d086842f5d6e766d9d51commit | diff
Merge tag 'fscrypt-for-stable' of git://git./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
Linux 6.x block layer and io_uring tree(s)