Re: [ANNOUNCE] 4.4.176-cip31-rt23


Daniel Wagner <wagi@...>
 

Is there a chance to update 4.4-rt based on Daniel' 4.4.179-rt181 release, but
then to 4.4.182 in order to have SACK fixes in?
Do you want 4.4.184, too, which fixes the SACK fixes? :-).
I'm up-to 4.4.179-rt181-cip32.
If I attempt to move forward to 4.4.181-cip3, I get some conflicts in
rather core files.
Auto-merging kernel/cpu.c
CONFLICT (content): Merge conflict in kernel/cpu.c
Auto-merging include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/sched.h
Auto-merging arch/x86/include/asm/thread_info.h
CONFLICT (content): Merge conflict in
I can attempt something, but I'd feel safer waiting for -stable-rt to
solve it for me.
FWIW, I am updating the stable-rt tree right now. As noted there are a couple of merge conflicts ahead. Right now I am testing the result of the v4.4.180 merge. So far all looks good and now I am waiting for the test results from the CI system. After that I keep merging.

In case you are wondering how the workflow works. We stable-rt maintainer merge the latest stable release and make a release if there is no merge conflict. If there is a merge conflict, that particular stable merge will be released as separate version. That allows to review the merge conflicts more easily.

Join cip-dev@lists.cip-project.org to automatically receive all group messages.