OSDN Git Service

Merge branch 'sthyi' into features
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 9 Oct 2017 09:16:49 +0000 (11:16 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 9 Oct 2017 09:16:49 +0000 (11:16 +0200)
commit3bdf5679c9e46088a0d677e795afc92b5f77940f
treebe5a99e62b5ff078413d71297154ece9f724ec9e
parent91a1fad759ffd616b836984ca0420c7ad5996eef
parent3d8757b87d7fc15a87928bc970f060bc9c6dc618
Merge branch 'sthyi' into features

Add the store-hypervisor-information code into features
using a tip branch for parallel merging into the KVM tree.
arch/s390/include/asm/sysinfo.h
arch/s390/kernel/Makefile
arch/s390/kvm/kvm-s390.c