Merge ~paelzer/ubuntu/+source/qemu:bug-1842774-z15name-disco into ubuntu/+source/qemu:ubuntu/disco-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1847948-nvmeperf-1842774-z15name-bionic

[Christian Ehrhardt  (paelzer)]

As states [1] for the SRU Team, I'm aware that this change alone does not fulfil the needs for a SRU but it is ok to be done and we'd want to avoid that it changes in between B->D->E so I'm uploading this along the Bionic fix (which will reach much more people and has a reasonable change along it).

[1]: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1842774/comments/22

[Rafael David Tinoco (rafaeldtinoco)]

QEMU patch is 1:1 with upstream, and very minor, but needed for migration compatibility, according to IBM's comment: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1842774/comments/12
 after Christian's investigation. Waiting for a bigger SRU for the merge seems appropriate.

+1 on my side.

review: Approve

[Christian Ehrhardt  (paelzer)]

$ git push pkg upload/1%3.1+dfsg-2ubuntu3.6
...
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/qemu
 * [new tag] upload/1%3.1+dfsg-2ubuntu3.6 -> upload/1%3.1+dfsg-2ubuntu3.6

$ dput ubuntu ../qemu_3.1+dfsg-2ubuntu3.6_source.changes
Checking signature on .changes
gpg: ../qemu_3.1+dfsg-2ubuntu3.6_source.changes: Error checking signature from BA3E29338280B242: SignatureVerifyError: 0
Checking signature on .dsc
gpg: ../qemu_3.1+dfsg-2ubuntu3.6.dsc: Error checking signature from BA3E29338280B242: SignatureVerifyError: 0
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_3.1+dfsg-2ubuntu3.6.dsc: done.
  Uploading qemu_3.1+dfsg-2ubuntu3.6.debian.tar.xz: done.
  Uploading qemu_3.1+dfsg-2ubuntu3.6_source.buildinfo: done.
  Uploading qemu_3.1+dfsg-2ubuntu3.6_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Migrated, setting merged

diff --git a/debian/changelog b/debian/changelog
index b39b112..c7dd071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:3.1+dfsg-2ubuntu3.6) disco; urgency=medium
+
+  * d/p/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch:
+    update the z15 model name (LP: #1842774)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 15 Oct 2019 11:37:44 +0200
+
 qemu (1:3.1+dfsg-2ubuntu3.5) disco; urgency=medium
 
   * d/binfmt-update-in: fix binfmt usage in some containers (LP: #1840956)
diff --git a/debian/patches/series b/debian/patches/series
index 7dfee6f..e06314c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@ ubuntu/lp-1836154-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch
 ubuntu/lp-1836154-s390-cpumodel-fix-description-for-the-new-vector-fac.patch
 ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
 ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
+ubuntu/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
diff --git a/debian/patches/ubuntu/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch b/debian/patches/ubuntu/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
 new file mode 100644
index 0000000..f54a573
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
@@ -0,0 +1,34 @@
+From 7505deca0bfa859136ec6419dbafc504f22fcac2 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Wed, 18 Sep 2019 16:42:14 +0200
+Subject: [PATCH] s390x/cpumodel: Add the z15 name to the description of gen15a
+
+We now know that gen15a is called z15.
+
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Christian Borntraeger <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=7505deca
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842774
+Last-Update: 2019-09-24
+
+---
+ target/s390x/cpu_models.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
+index 1d16d7d5e7..009afc38b9 100644
+--- a/target/s390x/cpu_models.c
++++ b/target/s390x/cpu_models.c
+@@ -84,7 +84,7 @@ static S390CPUDef s390_cpu_defs[] = {
+     CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
+     CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
+     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
+-    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
++    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 GA1"),
+     CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
+ };
+ 
+-- 
+2.23.0
+