summaryrefslogtreecommitdiff
path: root/include/uapi/scsi/scsi_netlink.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/scsi/scsi_netlink.h')
0 files changed, 0 insertions, 0 deletions
3e4216b65e7d91ab70ff8e5b65c9fde9 (diff)parent678b5c6b22fed89a13d5b2267f423069a9b11c80 (diff)
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: - Fix pointer size when caam is used with AArch64 boot loader on AArch32 kernel. - Fix ahash state corruption in marvell driver. - Fix buggy algif_aed tag handling. - Prevent mcryptd from being used with incompatible algorithms which can cause crashes" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - fix uninitialized variable warning crypto: mcryptd - Check mcryptd algorithm compatibility crypto: algif_aead - fix AEAD tag memory handling crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash crypto: marvell - Don't copy hash operation twice into the SRAM
Diffstat (limited to 'net/vmw_vsock/vmci_transport_notify.c')