git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit

author	Heiko Carstens <heiko.carstens@de.ibm.com>
	Fri, 13 Apr 2018 12:04:24 +0000 (14:04 +0200)
committer	Khalid Elmously <khalid.elmously@canonical.com>
	Wed, 6 Jun 2018 15:50:16 +0000 (11:50 -0400)
commit	734fce8d50863764260289d3d6b527b7899f76c9
tree	9ca1d52c4ae0196d66f9cb5a32d9675537fcd71f	tree
parent	26e04484dd273f28856ab724ddc202bb51f795f2	commit \| diff

s390: add support for IBM z14 Model ZR1

BugLink: http://bugs.launchpad.net/bugs/1773233
commit 451239eb3d397bd197a79cc3aab943da41ba0905 upstream.

Just add the new machine type number to the two places that matter.

Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

arch/s390/Kconfig		diff \| blob \| blame \| history
arch/s390/kernel/perf_cpum_cf_events.c		diff \| blob \| blame \| history
arch/s390/kernel/setup.c		diff \| blob \| blame \| history