OSDN Git Service

Merge branch 's390/fixes' into features
authorVasily Gorbik <gor@linux.ibm.com>
Mon, 7 Jun 2021 15:11:10 +0000 (17:11 +0200)
committerVasily Gorbik <gor@linux.ibm.com>
Mon, 7 Jun 2021 15:11:10 +0000 (17:11 +0200)
commit3bd695813628816a49cb8d79e3398796c9de79f2
tree98a51c076f65528ab04c591c3969887803cd1c91
parent21aadf2eb055187ae8724997e6aca76e0d548447
parent1874cb13d5d7cafa61ce93a760093ebc5485b6ab
Merge branch 's390/fixes' into features

This helps to avoid merge conflicts later.

* fixes:
  s390/mcck: fix invalid KVM guest condition check
  s390/mcck: fix calculation of SIE critical section size

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/kernel/entry.S