In message: Trial merge of v5.15.119 v6.1.36 for linux-yocto
on 29/06/2023 Kevin Hao wrote:
> Hi Bruce,
>
> This is a trial merge of the stable kernel v5.15.119 v6.1.36 for the
> following branches in the linux-yocto.
> be40fc41bd6e v5.15/standard/sdkv5.10/axxia
> e75835741a61 v5.15/standard/preempt-rt/sdkv5.10/axxia
> 5286aba085f3 v5.15/standard/base
> 2ecfdafb698d v5.15/standard/preempt-rt/base
> 8fa9560c4dd4 v5.15/standard/cn-sdkv5.4/octeon
> 63def203e4e4 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
> c6a6f3f7ccb0 v5.15/standard/cn-sdkv5.15/octeon
> c85fe0177765 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
> 3a984e518a65 v5.15/standard/ti-sdk-5.10/ti-j72xx
> 6e6d68f31692 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
> ef85dc984077 v5.15/standard/nxp-sdk-5.15/nxp-soc
> #Have textual conflicts
> d442c239e922 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
> #Have textual conflicts
> ca6190648f39 v5.15/standard/bcm-2xxx-rpi
> fe77be715143 v5.15/standard/preempt-rt/bcm-2xxx-rpi
> a0e68ed68874 v5.15/standard/nxp-sdk-5.15/nxp-s32g
> 731e0747cfc8 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> 33587f804c1f v5.15/standard/intel-sdk-5.15/intel-socfpga
> 737a52381316 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
> 93636851643a v5.15/standard/x86
> 13e6b9070532 v5.15/standard/preempt-rt/x86
> 06e2203ca6b4 v5.15/standard/sdkv5.15/xlnx-soc
> fae6ce5c0f62 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
> 6ddeb74e2aed v6.1/standard/base
> #Have textual conflicts
> 5b1265e16f7c v6.1/standard/preempt-rt/base
> b6138f7d213f v6.1/standard/ti-sdk-6.1/ti-j7xxx
> 411bdd3dfd02 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
> 32bbd6f8e4a5 v6.1/standard/nxp-sdk-6.1/nxp-soc
> #Have textual conflicts
> b290cbd38c6f v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
> #Have textual conflicts
> 9ed6c482ead6 v6.1/standard/cn-sdkv5.15/octeon
> ad8cdb51154a v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
> 1178a4b79ab9 v6.1/standard/bcm-2xxx-rpi
> e7efd0895134 v6.1/standard/preempt-rt/bcm-2xxx-rpi
> 3bf26017b1d0 v6.1/standard/nxp-sdk-5.15/nxp-s32g
> 60acc0e89194 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> 363ec7b1b160 v6.1/standard/intel-sdk-6.1/intel-socfpga
> 88d337e2b686 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
> 8ae2964866b5 v6.1/standard/x86
> 4bd09df854bd v6.1/standard/preempt-rt/x86
> 1233d3e4f7e3 v6.1/standard/sdkv6.1/xlnx-soc
> e9c4e041e2f0 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
>
> This seems a normal stable release. There is a conflict on v6.1/standard/base
> due to
> the merge of commit 0c6552f83725 ("tick/common: Align tick period during
> sched_timer setup")
Thanks Kevin,
Yes, this conflict was expected as I couldn't wait for fix to come through
-stable for our intermittent x86 boot hangs.
I've reverted my previous revert and now the merge is clean to standard/base
Bruce
> and several trivial conflicts on the nxp branches. 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12842):
https://lists.yoctoproject.org/g/linux-yocto/message/12842
Mute This Topic: https://lists.yoctoproject.org/mt/99843837/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
