From: wagi@monom.org (Daniel Wagner)
To: cip-dev@lists.cip-project.org
Subject: [cip-dev] [ANNOUNCE] 4.4.176-cip31-rt23
Date: Tue, 16 Jul 2019 16:09:28 +0200 [thread overview]
Message-ID: <58c8af26-00ce-827d-999f-ccd545a0d974@monom.org> (raw)
In-Reply-To: <20190715134336.GB16268@amd>
>> 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.
next prev parent reply other threads:[~2019-07-16 14:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 11:06 [cip-dev] [ANNOUNCE] 4.4.176-cip31-rt23 Daniel Wagner
2019-07-11 8:47 ` Jan Kiszka
2019-07-15 12:24 ` Pavel Machek
2019-07-15 13:43 ` Pavel Machek
2019-07-16 14:09 ` Daniel Wagner [this message]
2019-07-16 20:14 ` Pavel Machek
2019-07-17 6:46 ` Daniel Wagner
2019-07-17 12:16 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58c8af26-00ce-827d-999f-ccd545a0d974@monom.org \
--to=wagi@monom.org \
--cc=cip-dev@lists.cip-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.