Sorry for coming back to this with a little delay, due to the 21.10 FF
and the 20.04.3 RCs ...

I'm not sure if I understood you correctly.
Does that mean that the commits 27c4f6738bdc to 91ffc519c199 from comment #5 
all needed to be touched and are backports?
And that the remaining ones are all just plain exports - w/o any modification, 
hence can simply be cherry-picked?

This distinction is very crucial and need to be added to each of the
commits, so that the entire provenance of the commit/patch is traceable.

So in other words all commits that had to be touches ('backported') need to 
have lines like this:
"
(backported from commit 5620ae29f1eabe655f44335231b580a78c8364ea)
Signed-off-by: First-Name Last-Name <first-name.last-n...@domain.com>
"
(like described here: https://wiki.ubuntu.com/Kernel/Dev/StablePatchFormat
 this is not unique to the Canonical kernel team procedure, but a kind of a 
de-facto standard ...)
Here is an example LP bug with backports attached:
https://bugs.launchpad.net/bugs/1925452

Generally the others would need lines like this:
"
(cherry picked from commit d4e0018e3e4dd685af25d300fd26a0d5a984482e)
Signed-off-by: First-Name Last-Name <first-name.last-n...@domain.com>
"

But the 'cherry-picked' lines do not need to be added manually, since
git helps on doing this.

(If you grep for 'backport' or 'cherry-picked' though the list of
patches in your zip file I get no hits.)

---

So what we need is:
1) separate 'backport' files of the modified commits only,
   that have a 'backported' AND an additional 'Signed-off-by' line included by 
the backporter
   (no files are needed for commits that can just be cherry picked)
2) a list / sequence of the backport files AND cherry pick commits,
   that allows to get the entire set of needed commits/patches (cherry-picks 
and backports)
   applied to the Ubuntu focal master-next git tree
   [git://kernel.ubuntu.com/ubuntu/ubuntu-focal --branch master-next 
--single-branch]
   (we need to be able to re-run and re-apply this again)

The rest can( and is) usually done by us - means reapplying them,
pushing then to a remote git branch on Launchpad and finally sending a
pull request (incl. cover letter) to the Canonical kernel teams mailing
list.

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1939618

Title:
  EP11 cards going offline => Fix backport to U20.04LTS

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu-z-systems/+bug/1939618/+subscriptions


-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to