Merge git://github.com/herbertx/crypto

* git://github.com/herbertx/crypto: (48 commits)
  crypto: user - Depend on NET instead of selecting it
  crypto: user - Add dependency on NET
  crypto: talitos - handle descriptor not found in error path
  crypto: user - Initialise match in crypto_alg_match
  crypto: testmgr - add twofish tests
  crypto: testmgr - add blowfish test-vectors
  crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT
  crypto: twofish-x86_64-3way - fix ctr blocksize to 1
  crypto: blowfish-x86_64 - fix ctr blocksize to 1
  crypto: whirlpool - count rounds from 0
  crypto: Add userspace report for compress type algorithms
  crypto: Add userspace report for cipher type algorithms
  crypto: Add userspace report for rng type algorithms
  crypto: Add userspace report for pcompress type algorithms
  crypto: Add userspace report for nivaead type algorithms
  crypto: Add userspace report for aead type algorithms
  crypto: Add userspace report for givcipher type algorithms
  crypto: Add userspace report for ablkcipher type algorithms
  crypto: Add userspace report for blkcipher type algorithms
  crypto: Add userspace report for ahash type algorithms
  ...

diff --combined arch/x86/include/asm/cpufeature.h
index 2f84a43,48a93ef..f3444f7
--- 1/arch/x86/include/asm/cpufeature.h
--- 2/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@@ -114,14 -114,12 +114,14 @@@
  #define X86_FEATURE_CX16      (4*32+13) /* CMPXCHG16B */
  #define X86_FEATURE_XTPR      (4*32+14) /* Send Task Priority Messages */
  #define X86_FEATURE_PDCM      (4*32+15) /* Performance Capabilities */
 +#define X86_FEATURE_PCID      (4*32+17) /* Process Context Identifiers */
  #define X86_FEATURE_DCA               (4*32+18) /* Direct Cache Access */
  #define X86_FEATURE_XMM4_1    (4*32+19) /* "sse4_1" SSE-4.1 */
  #define X86_FEATURE_XMM4_2    (4*32+20) /* "sse4_2" SSE-4.2 */
  #define X86_FEATURE_X2APIC    (4*32+21) /* x2APIC */
  #define X86_FEATURE_MOVBE     (4*32+22) /* MOVBE instruction */
  #define X86_FEATURE_POPCNT      (4*32+23) /* POPCNT instruction */
 +#define X86_FEATURE_TSC_DEADLINE_TIMER        (4*32+24) /* Tsc deadline timer */
  #define X86_FEATURE_AES               (4*32+25) /* AES instructions */
  #define X86_FEATURE_XSAVE     (4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV */
  #define X86_FEATURE_OSXSAVE   (4*32+27) /* "" XSAVE enabled in the OS */
@@@ -259,7 -257,9 +259,9 @@@ extern const char * const x86_power_fla
  #define cpu_has_xmm           boot_cpu_has(X86_FEATURE_XMM)
  #define cpu_has_xmm2          boot_cpu_has(X86_FEATURE_XMM2)
  #define cpu_has_xmm3          boot_cpu_has(X86_FEATURE_XMM3)
+ #define cpu_has_ssse3         boot_cpu_has(X86_FEATURE_SSSE3)
  #define cpu_has_aes           boot_cpu_has(X86_FEATURE_AES)
+ #define cpu_has_avx           boot_cpu_has(X86_FEATURE_AVX)
  #define cpu_has_ht            boot_cpu_has(X86_FEATURE_HT)
  #define cpu_has_mp            boot_cpu_has(X86_FEATURE_MP)
  #define cpu_has_nx            boot_cpu_has(X86_FEATURE_NX)
@@@ -287,6 -287,7 +289,7 @@@
  #define cpu_has_xmm4_2                boot_cpu_has(X86_FEATURE_XMM4_2)
  #define cpu_has_x2apic                boot_cpu_has(X86_FEATURE_X2APIC)
  #define cpu_has_xsave         boot_cpu_has(X86_FEATURE_XSAVE)
+ #define cpu_has_osxsave               boot_cpu_has(X86_FEATURE_OSXSAVE)
  #define cpu_has_hypervisor    boot_cpu_has(X86_FEATURE_HYPERVISOR)
  #define cpu_has_pclmulqdq     boot_cpu_has(X86_FEATURE_PCLMULQDQ)
  #define cpu_has_perfctr_core  boot_cpu_has(X86_FEATURE_PERFCTR_CORE)
@@@ -334,6 -335,7 +337,6 @@@ static __always_inline __pure bool __st
                asm goto("1: jmp %l[t_no]\n"
                         "2:\n"
                         ".section .altinstructions,\"a\"\n"
 -                       _ASM_ALIGN "\n"
                         " .long 1b - .\n"
                         " .long 0\n"           /* no replacement */
                         " .word %P0\n"         /* feature bit */
@@@ -351,6 -353,7 +354,6 @@@
                asm volatile("1: movb $0,%0\n"
                             "2:\n"
                             ".section .altinstructions,\"a\"\n"
 -                           _ASM_ALIGN "\n"
                             " .long 1b - .\n"
                             " .long 3f - .\n"
                             " .word %P1\n"             /* feature bit */

diff --combined include/linux/netlink.h
index 8180cd9,464ace0..8374d29
--- 1/include/linux/netlink.h
--- 2/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@@ -1,7 -1,7 +1,7 @@@
  #ifndef __LINUX_NETLINK_H
  #define __LINUX_NETLINK_H
  
 -#include <linux/socket.h> /* for sa_family_t */
 +#include <linux/socket.h> /* for __kernel_sa_family_t */
  #include <linux/types.h>
  
  #define NETLINK_ROUTE         0       /* Routing/device hook                          */
@@@ -25,11 -25,12 +25,12 @@@
  #define NETLINK_SCSITRANSPORT 18      /* SCSI Transports */
  #define NETLINK_ECRYPTFS      19
  #define NETLINK_RDMA          20
+ #define NETLINK_CRYPTO                21      /* Crypto layer */
  
  #define MAX_LINKS 32          
  
  struct sockaddr_nl {
 -      sa_family_t     nl_family;      /* AF_NETLINK   */
 +      __kernel_sa_family_t    nl_family;      /* AF_NETLINK   */
        unsigned short  nl_pad;         /* zero         */
        __u32           nl_pid;         /* port ID      */
                __u32           nl_groups;      /* multicast groups mask */