]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 795c9a5 da72ca4)
Merge tag 'nmiforkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux...
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 28 Jun 2017 10:57:47 +0000 (12:57 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 28 Jun 2017 10:57:47 +0000 (12:57 +0200)
Pull kvm patches from Christian Borntraeger:
"s390,kvm: provide plumbing for machines checks when running guests"

This provides the basic plumbing for handling machine checks when
running guests

1  2 
arch/s390/include/asm/processor.h patch | diff1 | diff2 | blob | history
arch/s390/kernel/entry.S patch | diff1 | diff2 | blob | history

diff --cc arch/s390/include/asm/processor.h
Simple merge
diff --cc arch/s390/kernel/entry.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.