Comment 12 for bug 1834534

On Tue, 17 Mar 2020 at 14:56, bugproxy <email address hidden> wrote:
>
> ------- Comment From <email address hidden> 2020-03-17 10:47 EDT-------
> Did you use the command `git cherry-pick 971970989bbb1de..65b9fc442c1a4ff2458` to apply the commits? If so, please pick them individually.
>
> The reason I ask for this is that the listed commits should not have any
> changes to zdev, cpumf, zdump, ...

In anticipation of Ubuntu Feature Freeze and outstanding feature work,
prior to Ubuntu feature freeze I have uploaded s390-tools snapshot
into Focal based on 12th of February code drop
33031241c320f0479b39f55a0f86c5786f4c1822.

The expectation was that any further updates to the s390-tools master
repository, will be in line with Ubuntu Feature Freeze policy and
would only contain bug fixes and features requested to ship in 20.04
GA.

Since 33031241c320f0479b39f55a0f86c5786f4c1822 master branch has had
49 commits pushed, out of which 37 commits are now requested to be
cherrypicked
out of order. Majority of commits are in this requested, one commit is
another request, and a third request duplicates 4 commits from this
one.

Over 20.04 lifetime, we will be having s390-tools SRUs, and if I now
take 37/49 commits from master, any future cherrypicks will have
conflicts.

I am attaching a list of commits that are in master branch, but not in
Ubuntu. Those prefixed with Y were requested in this request, those
prefixed with O were requested in other tickets. Note that commit list
that is requested to be applied by Ubuntu looks like this at the
moment:
skip 1, take 1, skip 1, take 2, skip 5, take 4, skip 2, take 22, skip
2, take 8, skip 1.

Also I question the requirement of some of these commits. For example:
Y b06af60 README.md: remove useless empty line
is not really necessary for this feature, yet is requested to be cherrypicked.

Overall the order of commits on master branch, and their priority look
very messy.

This is starting to look a lot like the OpenSSL cherrypick requests,
which didn't take into account previous backports that were requested
and uploaded into Ubuntu thus all the patches provided, conflicted
with each other.

So, shall I cherry pick 37/49 commits and have cherrypick conflicts
for the next 10 years?
Or will you clean up master branch to drop commits you don't want to
request for 20.04 GA?
Or should I take the whole of master branch?
Do you want to cut an s390-tools release from the master branch for us
to ship that?

--
Regards,

Dimitri.