]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b38f56 cb69f36)
Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:17:04 +0000 (19:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:17:04 +0000 (19:17 -0700)
commit1ae276a9113305fb74c54f8df72da3ba2d559e60
tree1a71302c1f856a5b2c3e2d195b9c3719500dd251tree | snapshot
parent3b38f56c9dc262c31391b5ae095178960108049bcommit | diff
parentcb69f36ba1f8d5e73c46538e84a88178fb17f23dcommit | diff
Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:
 "Two small fixes to the code that initializes the per-file crypto
  contexts"

* tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: avoid ctx initialization race
  ecryptfs: remove check for if an array is NULL
Michael's Linux tree.