*** rajm <rajm!~robert@cpc126990-macc4-2-0-cust43.1-3.cable.virginm.net> has joined #cip | 07:09 | |
*** Tonux <Tonux!~Tonux@185.195.232.155> has joined #cip | 09:43 | |
Tonux | Hi there, in the 4.4 branches I'm just curious to what the '-st' suffix stands for and the purpose of that branch? | 09:45 |
---|---|---|
patersonc[m] | Hi Tonux . We got the same question last night :) Take a look at the log here: https://irclogs.baserock.org/cip/%23cip.2022-03-18.log.html | 09:53 |
patersonc[m] | Let me know if you want to know more | 09:53 |
Tonux | Ah, I think there's a good chance that is the person I was asking for actually. They posted on a forum yesterday asking me which I saw today but they must have asked here since. Thanks patersonc[m] :) | 09:56 |
patersonc[m] | :D | 09:57 |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff00e521267c2cad5182.dip0.t-ipconnect.de> has joined #cip | 10:38 | |
Flamefire | Hi, I also got a question about the -st branch in extension to what Atemu asked yesterday. (Same situation: Building a LineageOS Android using the 4.4 kernel): | 11:10 |
Flamefire | How "stable" are the branches, especially the "-st"(supposedly for "stable") supposed to be? E.g. I noticed a change in the git history as shown on e.g. https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/?h=linux-4.4.y-st | 11:10 |
Flamefire | Previously there was a commit "Merge patches from 4.9.301." on top of "HID: wacom: add USB_HID dependency" which has (very) recently been replaced by "Merge patches from 4.9.302." probably using a force-push | 11:10 |
Flamefire | For context: Phone vendors often modify the kernel to (better) support the specific hardware. When extending maintenance of such devices we can only merge (previously upstream) kernels into that modified kernel to include security fixes etc. instead of directly tracking/using a specific branch. With the end of LTS for 4.4.y using the CIP | 11:10 |
Flamefire | linux-4.4.y-st branch seems to be the way to go now. But unstable branches may cause headaches (merge conflicts...) There seemingly are no releases of the -st branch yet and the last release/tag on the linux-4.4.y-cip branch is over a month old. | 11:10 |
Flamefire | So in short: Is it even advisable to merge from a branch directly? Or are such (git) history changes to be expected between releases/tags so it would be better to wait for a release at the expense of missing the most recent fixes? | 11:10 |
Tonux | Oh hi Flamefire, I incorrectly assumed it was you who posted here last night | 11:23 |
Flamefire | Yeah, I'm seemingly not the only one wondering about those -st branches. And in extension: Not the only one in Android development who benefits from CIPs SLTS of the 4.4 kernel. So thanks for that to the maintainers! | 12:07 |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff00e521267c2cad5182.dip0.t-ipconnect.de> has quit IRC | 13:23 | |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff00e819565414a9445a.dip0.t-ipconnect.de> has joined #cip | 14:39 | |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff00e819565414a9445a.dip0.t-ipconnect.de> has quit IRC | 14:46 | |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff0084d36e56e41d7704.dip0.t-ipconnect.de> has joined #cip | 19:38 | |
*** Flamefire <Flamefire!~Flamefire@p200300f6af2cff0084d36e56e41d7704.dip0.t-ipconnect.de> has quit IRC | 21:15 | |
*** rajm <rajm!~robert@cpc126990-macc4-2-0-cust43.1-3.cable.virginm.net> has quit IRC | 22:51 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!