Skip to contentSkip to conversation

s390 patches for the 5.4 merge window #2

GIT PULL Merged Vasily Gorbik 2 participants 2 messages Sep 26, 2019 s390

lore
Share & tools
lore

Vasily Gorbik

author maintainer
#0 lore raw

Hello Linus,

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

Thank you,
Vasily

The following changes since commit d590284419b1d7cc2dc646e9bdde4da19061cf0f:

Merge tag 's390-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (2019-09-17 14:04:43 -0700)

are available in the Git repository at:

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

for you to fetch changes up to ab5758848039de9a4b249d46e4ab591197eebaf2:

s390/cio: exclude subchannels with no parent from pseudo check (2019-09-23 23:27:53 +0200)

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

- Fix 3 kasan findings.

- Add PERF_EVENT_IOC_PERIOD ioctl support.

- Add Crypto Express7S support and extend sysfs attributes for pkey.

- Minor common I/O layer documentation corrections.

----------------------------------------------------------------
Cornelia Huck (1):
s390/cio: fix intparm documentation

Harald Freudenberger (1):
s390/zcrypt: CEX7S exploitation support

Ingo Franzki (1):
s390/pkey: Add sysfs attributes to emit AES CIPHER key blobs

Thomas Richter (2):
s390/cpum_sf: Support ioctl PERF_EVENT_IOC_PERIOD s390/cpumf: Remove mixed white space

Vasily Gorbik (3):
s390/topology: avoid firing events before kobjs are created s390/cio: avoid calling strlen on null pointer s390/cio: exclude subchannels with no parent from pseudo check

 arch/s390/include/asm/cpu_mf.h      |  10 +--
 arch/s390/include/asm/perf_event.h  |   2 +
 arch/s390/include/uapi/asm/zcrypt.h |   4 +-
 arch/s390/kernel/perf_cpum_sf.c     | 165 +++++++++++++++++++++++++++---------
 arch/s390/kernel/topology.c         |   3 +-
 drivers/s390/cio/ccwgroup.c         |   2 +-
 drivers/s390/cio/css.c              |   2 +
 drivers/s390/cio/device_ops.c       |  23 +++--
 drivers/s390/crypto/ap_bus.c        |  12 +--
 drivers/s390/crypto/ap_bus.h        |   3 +-
 drivers/s390/crypto/pkey_api.c      | 113 ++++++++++++++++++++++++
 drivers/s390/crypto/vfio_ap_drv.c   |   2 +
 drivers/s390/crypto/zcrypt_api.h    |   3 +-
 drivers/s390/crypto/zcrypt_cex4.c   |  72 +++++++++++-----
 14 files changed, 334 insertions(+), 82 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 26 Sep 2019 16:58:34 +0200:

The pull request you sent on Thu, 26 Sep 2019 16:58:34 +0200:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/16cdf08467848dc53acd2175d563b30a3cd486aa

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker