diff options
| author | Linus Torvalds | 2017-03-25 15:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-25 15:36:56 -0700 |
| commit | a643f9054c21f4fae0fbb4add663462fea7a47f0 (patch) | |
| tree | 24b280c94f6499a175e1a2d2267b8c27ef8c8bbf /net/dccp | |
| parent | a00da40fc7a4f5000302d003dd469f132f7dfa55 (diff) | |
| parent | 94840e3c802daa1a62985957f36ac48faf8ceedd (diff) | |
Merge tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypto fixes from Ted Ts'o:
"A code cleanup and bugfix for fs/crypto"
* tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: eliminate ->prepare_context() operation
fscrypt: remove broken support for detecting keyring key revocation
Diffstat (limited to 'net/dccp')
0 files changed, 0 insertions, 0 deletions