diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-31 19:42:14 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-31 19:42:14 +0300 |
| commit | 071e31e254e0e0c438eecba3dba1d6e2d0da36c2 (patch) | |
| tree | a0d2761d7dcf00fb202d61adaf87d8f311834bf1 /fs/xfs/libxfs/xfs_format.h | |
| parent | 9f834ec18defc369d73ccf9e87a2790bfa05bf46 (diff) | |
| parent | 901d3d4fee83e9407d91e7178048e2fed6c91f6b (diff) | |
| download | linux-071e31e254e0e0c438eecba3dba1d6e2d0da36c2.tar.xz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- Kconfig problem that prevented mxc-rnga from being enabled
- bogus key sizes in qat aes-xts
- buggy aes-xts code in vmx"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: vmx - fix null dereference in p8_aes_xts_crypt
crypto: qat - fix aes-xts key sizes
hwrng: mxc-rnga - Fix Kconfig dependency
Diffstat (limited to 'fs/xfs/libxfs/xfs_format.h')
0 files changed, 0 insertions, 0 deletions