| commit | c09b5cbd0d88317785de87bcdfe4052f9785c473 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 27 08:40:44 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 27 08:40:44 2015 -0700 |
| tree | 3547b518d3683cd2f3ae8305aaefbad3cbcf7bc6 | |
| parent | a8b253b9f253c05e5e10b829b8d1fb24556f4b56 [diff] | |
| parent | f858c7bcca8c20761a20593439fe998b4b67e86b [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This disables the newly (4.1) added user-space AEAD interface so that we can fix issues in the underlying kernel AEAD interface. Once the new kernel AEAD interface is ready we can then reenable the user-space AEAD interface" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - Disable AEAD user-space for now