Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 5 Feb 2020 17:11:35 +0100
From:   Vasily Gorbik <gor@linux.ibm.com>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     linux-kernel <linux-kernel@vger.kernel.org>,
        linux-s390 <linux-s390@vger.kernel.org>,
        Heiko Carstens <heiko.carstens@de.ibm.com>,
        Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [GIT PULL] s390 patches for the 5.6 merge window #2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Message-Id: <your-ad-here.call-01580919095-ext-5211@work.hours>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hello Linus,

please pull the second round of s390 fixes and features for 5.6.

Thank you,
Vasily

The following changes since commit 740eaf7d4dd255789987a543b0203ca239b37087:

  Merge tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (2020-01-28 18:43:08 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux tags/s390-5.6-2

for you to fetch changes up to 55d0a513a0e202c68af2c8f4b1e923a345227bbb:

  s390/pkey/zcrypt: Support EP11 AES secure keys (2020-01-30 13:07:56 +0100)

----------------------------------------------------------------
s390 updates for the 5.6 merge window #2

- Add KPROBES_ON_FTRACE support.

- Add EP11 AES secure keys support.

- PAES rework and prerequisites for paes-s390 ciphers selftests.

- Fix page table upgrade for hugetlbfs.

----------------------------------------------------------------
Gerald Schaefer (1):
      s390/mm: fix dynamic pagetable upgrade for hugetlbfs

Harald Freudenberger (8):
      s390/crypto: Rework on paes implementation
      s390/pkey: Add support for key blob with clear key value
      s390/crypto: enable clear key values for paes ciphers
      s390/zcrypt: enable card/domain autoselect on ep11 cprbs
      s390/zcrypt: ep11 structs rework, export zcrypt_send_ep11_cprb
      s390/zcrypt: add new low level ep11 functions support file
      s390/zcrypt: extend EP11 card and queue sysfs attributes
      s390/pkey/zcrypt: Support EP11 AES secure keys

Sven Schnelle (1):
      s390: support KPROBES_ON_FTRACE

 .../debug/kprobes-on-ftrace/arch-support.txt       |    2 +-
 arch/s390/Kconfig                                  |    1 +
 arch/s390/crypto/paes_s390.c                       |  230 +++-
 arch/s390/include/asm/kprobes.h                    |    1 -
 arch/s390/include/asm/page.h                       |    2 +
 arch/s390/include/uapi/asm/pkey.h                  |   69 +-
 arch/s390/include/uapi/asm/zcrypt.h                |   32 +-
 arch/s390/kernel/ftrace.c                          |   80 +-
 arch/s390/kernel/kprobes.c                         |   61 +-
 arch/s390/kernel/mcount.S                          |    6 +
 arch/s390/mm/hugetlbpage.c                         |  100 +-
 drivers/s390/crypto/Makefile                       |    3 +-
 drivers/s390/crypto/pkey_api.c                     |  470 ++++++-
 drivers/s390/crypto/zcrypt_api.c                   |   27 +-
 drivers/s390/crypto/zcrypt_api.h                   |    1 +
 drivers/s390/crypto/zcrypt_ccamisc.h               |    1 +
 drivers/s390/crypto/zcrypt_cex4.c                  |  273 ++++-
 drivers/s390/crypto/zcrypt_ep11misc.c              | 1293 ++++++++++++++++++++
 drivers/s390/crypto/zcrypt_ep11misc.h              |  124 ++
 19 files changed, 2494 insertions(+), 282 deletions(-)
 create mode 100644 drivers/s390/crypto/zcrypt_ep11misc.c
 create mode 100644 drivers/s390/crypto/zcrypt_ep11misc.h