Conflict for v5.15-rt
Joseph Salisbury <[email protected]> Tue, 26 Sep 2023 15:20:35 -0400
| Newsgroups | org.kernel.vger.stable-rt |
|---|---|
| Message-ID | <[email protected]> |
Hey Stable Folks,
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.
Thanks,
Joe