From: Joseph Salisbury <joseph.salisbury@canonical.com>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Clark Williams <williams@redhat.com>,
Clark Williams <clark.williams@gmail.com>,
lgoncalv@redhat.com, daniel.wagner@suse.com,
tom.zanussi@linux.intel.com, "Gross, Mark" <mark.gross@intel.com>,
john.ogness@linutronix.de, stable-rt@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>
Subject: Re: Conflict for v5.15-rt
Date: Wed, 27 Sep 2023 10:58:01 -0400 [thread overview]
Message-ID: <0c80279b-e836-64a7-2bbb-6520e1834360@canonical.com> (raw)
In-Reply-To: <20230927063438.ddjwR4DY@linutronix.de>
On 9/27/23 02:34, Sebastian Andrzej Siewior wrote:
> On 2023-09-26 15:20:35 [-0400], Joseph Salisbury wrote:
>> Hey Stable Folks,
> Hi,
>
>> While creating the real-time stable kernel, v5.15-rt68, I ran into a
>> conflict. The conflict occurred while merging in upstream stable 5.15.133
>> due to the following commit:
>> f980bf1586ef ("printk: Consolidate console deferred printing") Upstream
>> commit 696ffaf50e1f
>>
>> I was wondering if you came across this commit for v6.1-rt yet, Clark? If
>> you did, how did you proceed with the backport? For v5.15-rt, there is the
>> following patch that touches the same code, so I wanted to be careful:
>> 0009-printk-call-boot_delay_msec-in-printk_delay.patch - [PATCH 009/171]
>> printk: call boot_delay_msec() in printk_delay()
>>
>> I wanted to run this buy you all prior to backporting, and ensure I follow
>> what all other stable versions plan on doing.
> I dropped that patch while doing v5.19-rc1-rt1. It was merged as
> 1f47e8af45fdd ("printk: call boot_delay_msec() in printk_delay()")
>
> meaning Clark shouldn't have any problems related to this.
Ok, I understand. Thanks for the feedback!
>
> Would looking at later RT kernel help? As of v6.6-rc1-rt1 the printk
> code is mostly the same.
I'll do this. Thanks again for the suggestions and help!
>
>> Thanks,
>>
>> Joe
> Sebastian
prev parent reply other threads:[~2023-09-27 14:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 19:20 Conflict for v5.15-rt Joseph Salisbury
2023-09-27 6:34 ` Sebastian Andrzej Siewior
2023-09-27 14:58 ` Joseph Salisbury [this message]
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=0c80279b-e836-64a7-2bbb-6520e1834360@canonical.com \
--to=joseph.salisbury@canonical.com \
--cc=bigeasy@linutronix.de \
--cc=clark.williams@gmail.com \
--cc=daniel.wagner@suse.com \
--cc=john.ogness@linutronix.de \
--cc=lgoncalv@redhat.com \
--cc=mark.gross@intel.com \
--cc=rostedt@goodmis.org \
--cc=stable-rt@vger.kernel.org \
--cc=tom.zanussi@linux.intel.com \
--cc=williams@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).