Skip to content
  • Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 31caf8b2
    Linus Torvalds authored
    Pull crypto update from Herbert Xu:
     "API:
       - Restrict crypto_cipher to internal API users only.
    
      Algorithms:
       - Add x86 aesni acceleration for cts.
       - Improve x86 aesni acceleration for xts.
       - Remove x86 acceleration of some uncommon algorithms.
       - Remove RIPE-MD, Tiger and Salsa20.
       - Remove tnepres.
       - Add ARM acceleration for BLAKE2s and BLAKE2b.
    
      Drivers:
       - Add Keem Bay OCS HCU driver.
       - Add Marvell OcteonTX2 CPT PF driver.
       - Remove PicoXcell driver.
       - Remove mediatek driver"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (154 commits)
      hwrng: timeriomem - Use device-managed registration API
      crypto: hisilicon/qm - fix printing format issue
      crypto: hisilicon/qm - do not reset hardware when CE happens
      crypto: hisilicon/qm - update irqflag
      crypto: hisilicon/qm - fix the value of 'QM_SQC_VFT_BASE_MASK_V2'
      crypto: hisilicon/qm - fix request missing error
      crypto: hisilicon/qm - removing driver after reset
      crypto: octeontx2 - fix -Wpointer-bool-conversion warning
      crypto: hisilicon/hpre - enable Elliptic curve cryptography
      crypto: hisilicon - PASID fixed on Kunpeng 930
      crypto: hisilicon/qm - fix use of 'dma_map_single'
      crypto: hisilicon/hpre - tiny fix
      crypto: hisilicon/hpre - adapt the number of clusters
      crypto: cpt - remove casting dma_alloc_coherent
      crypto: keembay-ocs-aes - Fix 'q' assignment during CCM B0 generation
      crypto: xor - Fix typo of optimization
      hwrng: optee - Use device-managed registration API
      crypto: arm64/crc-t10dif - move NEON yield to C code
      crypto: arm64/aes-ce-mac - simplify NEON yield
      crypto: arm64/aes-neonbs - remove NEON yield calls
      ...
    31caf8b2