• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 3f5595e3
    Linus Torvalds authored
    Pull more s390 updates from Martin Schwidefsky:
     "Next to the usual bug fixes (including the TASK_SIZE fix), there is
      one larger crypto item. It allows to use protected keys with the
      in-kernel crypto API
    
      The protected key support has two parts, the pkey user space API to
      convert key formats and the paes crypto module that uses a protected
      key instead of a standard AES key"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390: TASK_SIZE for kernel threads
      s390/crypt: Add protected key AES module
      s390/dasd: fix spelling mistake: "supportet" -> "supported"
      s390/pkey: Introduce pkey kernel module
      s390/zcrypt: export additional symbols
      s390/zcrypt: Rework CONFIG_ZCRYPT Kconfig text.
      s390/zcrypt: Cleanup leftover module code.
      s390/nmi: purge tlbs after control register validation
      s390/nmi: fix order of register validation
      s390/crypto: Add PCKMO inline function
      s390/zcrypt: Enable request count reset for cards and queues.
      s390/mm: use _SEGMENT_ENTRY_EMPTY in the code
      s390/chsc: Add exception handler for CHSC instruction
      s390: opt into HAVE_COPY_THREAD_TLS
      s390: restore address space when returning to user space
      s390: rename CIF_ASCE to CIF_ASCE_PRIMARY
    3f5595e3
Kconfig 18.3 KB