In message: [linux-yocto] Trial merge of v6.1.84 for linux-yocto
on 05/04/2024 Kevin Hao wrote:
> Hi Bruce,
>
> This is a trial merge of the stable kernel v6.1.84 for the following branches
> in the linux-yocto.
> 7e8aba41d616 v6.1/standard/sdkv5.10/axxia
> 20b864b63270 v6.1/standard/preempt-rt/sdkv5.10/axxia
> #Have textual conflicts
> 6e7505a77dab v6.1/standard/base
> a0836e0ed8b0 v6.1/standard/preempt-rt/base
> #Have textual conflicts
> c8a6a6ede39b v6.1/standard/ti-sdk-6.1/ti-j7xxx
> #Have textual and semantic conflicts
> 6b0bd6c88b2b v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
> #Have textual and semantic conflicts
> 39ae0de6c0d0 v6.1/standard/nxp-sdk-6.1/nxp-soc
> fb59778024f1 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
> #Have textual conflicts
> e3971ab030ed v6.1/standard/cn-sdkv5.15/octeon
> 459b44937628 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
> #Have textual conflicts
> cd0f526a7e68 v6.1/standard/cn-sdkv6.1/octeon
> af294cdc7744 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
> #Have textual conflicts
> 33d58f391255 v6.1/standard/microchip-polarfire-soc
> 7a324d693ac0 v6.1/standard/preempt-rt/microchip-polarfire-soc
> #Have textual conflicts
> fa81a6f5ee82 v6.1/standard/bcm-2xxx-rpi
> 7d18665d29dc v6.1/standard/preempt-rt/bcm-2xxx-rpi
> #Have textual conflicts
> 88714ab2b982 v6.1/standard/nxp-sdk-5.15/nxp-s32g
> f7261b4f1704 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> #Have textual conflicts
> b3001ad2c0f0 v6.1/standard/intel-sdk-6.1/intel-socfpga
> #Have textual conflicts
> 23a0b1e792c8 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
> #Have textual conflicts
> 158fbc5639bd v6.1/standard/x86
> 6657024d2663 v6.1/standard/preempt-rt/x86
> #Have textual conflicts
> 64960db058fe v6.1/standard/sdkv6.1/xlnx-soc
> 6d72a43f8f44 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
> #Have textual conflicts
>
> - There is a conflict on the RT kernel, it was caused by following two
> commits:
> stable commit b8073c069a84 ("serial: Lock console when calling into
> driver before registration")
> RT commit 9c5c63877973 ("serial: 8250: implement write_atomic").
> This merge conflict is not too difficult to resolve.
>
> - There are many ugly merge conflicts in dwc3-am62 driver on j7xx branches
> due to the private data rename.
> aa1d1ce1ad6b ("usb: dwc3-am62: Rename private data")
> I believe I have resolved all of them.
>
> All the branches have passed my build test. I have pushed all these branches
> to:
> https://github.com/haokexin/linux
>
> You can use this as a reference for the linux-yocto stable kernel bump.
Thanks Kevin,
I did a smilar merge and grabbed your resolutions .. the ti-jxxx BSPs certainly
caused some issues :)
IF anything is still broken, ssend follow up patches.
Bruce
>
> Thanks,
> Kevin
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13782):
https://lists.yoctoproject.org/g/linux-yocto/message/13782
Mute This Topic: https://lists.yoctoproject.org/mt/105346373/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
