projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21aadf2
1874cb1
)
Merge branch 's390/fixes' into features
author
Vasily Gorbik
<gor@linux.ibm.com>
Mon, 7 Jun 2021 15:11:10 +0000
(17:11 +0200)
committer
Vasily Gorbik
<gor@linux.ibm.com>
Mon, 7 Jun 2021 15:11:10 +0000
(17:11 +0200)
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>
1
2
arch/s390/kernel/entry.S
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/s390/kernel/entry.S
Simple merge