Comment 25 for bug 1902179

------- Comment From <email address hidden> 2020-12-01 08:05 EDT-------
(In reply to comment #74)
> @Jason, seems to be some build failures. Can you please have a look.

It looks like there are two versions of this patch applied:
[PATCH] s390-tools: zipl: Fix NVMe partition and base device detection

Not sure how this happened. Here is the compiler output:

disk.c:174:12: error: redefinition of ?blkext_get_partnum?
174 | static int blkext_get_partnum(dev_t dev)
| ^~~~~~~~~~~~~~~~~~
disk.c:92:12: note: previous definition of ?blkext_get_partnum? was here
92 | static int blkext_get_partnum(dev_t dev)
| ^~~~~~~~~~~~~~~~~~

disk.c:199:12: error: redefinition of ?blkext_is_base_device?
199 | static int blkext_is_base_device(dev_t dev)
| ^~~~~~~~~~~~~~~~~~~~~
disk.c:117:12: note: previous definition of ?blkext_is_base_device? was here
117 | static int blkext_is_base_device(dev_t dev)
| ^~~~~~~~~~~~~~~~~~~~~

disk.c:213:12: error: redefinition of ?blkext_get_base_dev?
213 | static int blkext_get_base_dev(dev_t dev, dev_t *base_dev)
| ^~~~~~~~~~~~~~~~~~~
disk.c:131:12: note: previous definition of ?blkext_get_base_dev? was here
131 | static int blkext_get_base_dev(dev_t dev, dev_t *base_dev)
| ^~~~~~~~~~~~~~~~~~~

Can someone on Canonical's end manually verify this,and perhaps exclude the
above patch from their build if it seems to already be present?

I created the backport patches on top of the following repo/branch:
git://git.launchpad.net/ubuntu/+source/s390-tools
focal-proposed

And on this branch, this patch was missing, which is why I included it here.
Was I using the wrong repo/branch for this backport?