Re: Conflict for v5.15-rt

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





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




[Index of Archives]     [Linux USB Development]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux