Hi Bruce,
This is a trial merge of the stable kernel v5.15.128 v6.1.47 v6.1.48 for the
following branches in the linux-yocto.
baea59e6f13a v5.15/standard/sdkv5.10/axxia
60ede1f95de4 v5.15/standard/preempt-rt/sdkv5.10/axxia
01ea2de3cd26 v5.15/standard/base
788b7d1f5020 v5.15/standard/preempt-rt/base
9094f3a2974b v5.15/standard/cn-sdkv5.4/octeon
ec3711573590 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
929bfb857c1f v5.15/standard/cn-sdkv5.15/octeon
4e29816b1b84 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
c2f290f2a021 v5.15/standard/ti-sdk-5.10/ti-j72xx
4a43cca73f2f v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
20c5d6dd6425 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
cc0511d9998b v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
6590b7d3eeb8 v5.15/standard/bcm-2xxx-rpi
975d6a7b8074 v5.15/standard/preempt-rt/bcm-2xxx-rpi
b8ac1f088236 v5.15/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
4424040893e0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
57d07f618be7 v5.15/standard/intel-sdk-5.15/intel-socfpga
ebdf126a1813 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
06ca59179903 v5.15/standard/x86
36b36f00bbb9 v5.15/standard/preempt-rt/x86
22118ab2748f v5.15/standard/sdkv5.15/xlnx-soc
#Have textual and semantic conflicts
97a87a21745d v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual and semantic conflicts
93bf8a1d44a1 v6.1/standard/base
b2abe5edc54b v6.1/standard/preempt-rt/base
2db6077aa05e v6.1/standard/ti-sdk-6.1/ti-j7xxx
66e7e5991799 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
dbe400572dcd v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
83eb3c771258 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
07107e290f67 v6.1/standard/cn-sdkv5.15/octeon
b7e7dbf1569b v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
bbd6ef0f78ef v6.1/standard/bcm-2xxx-rpi
dcb0debd3f75 v6.1/standard/preempt-rt/bcm-2xxx-rpi
4c243bbfb1f1 v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
363e3130a87a v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
039d3c6fba9f v6.1/standard/intel-sdk-6.1/intel-socfpga
40a35fab7d92 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
61f089e874ec v6.1/standard/x86
055f3164c029 v6.1/standard/preempt-rt/x86
4d75faf14bcf v6.1/standard/sdkv6.1/xlnx-soc
9b4e148f792e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
This stable release took a bit longer, so there are more patches and merge
conflicts
than usual. Please note there are several semantic conflicts in the v5.15
xilinx 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 (#13020):
https://lists.yoctoproject.org/g/linux-yocto/message/13020
Mute This Topic: https://lists.yoctoproject.org/mt/100983559/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
