Hi Bruce,
This is a trial merge of the stable kernel v5.15.136 v6.1.58 v6.1.59 for the
following branches in the linux-yocto.
876d7300fe9e v5.15/standard/sdkv5.10/axxia
13fe5a251783 v5.15/standard/preempt-rt/sdkv5.10/axxia
2a9cd206a46f v5.15/standard/base
b3bbc5cb8dad v5.15/standard/preempt-rt/base
e17899c835c8 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
2ce7be4d0b9c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
e73e17908f83 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
fa752f26d7d6 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
6f79e767f22d v5.15/standard/ti-sdk-5.10/ti-j72xx
6c5107f3818e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
b71b0fb34b19 v5.15/standard/nxp-sdk-5.15/nxp-soc
3a7974fdc956 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
979ab01bc996 v5.15/standard/bcm-2xxx-rpi
4990d6e5509a v5.15/standard/preempt-rt/bcm-2xxx-rpi
113c99116e75 v5.15/standard/nxp-sdk-5.15/nxp-s32g
61244d30e75f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
2deeb8bec8f0 v5.15/standard/intel-sdk-5.15/intel-socfpga
5e719e5ec752 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
0ee9eb4752a0 v5.15/standard/x86
5208de4eab14 v5.15/standard/preempt-rt/x86
b42548ad0e07 v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
034467f43763 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
f30a924e947b v6.1/standard/base
cb3dd85b0dbc v6.1/standard/preempt-rt/base
28da30a3567f v6.1/standard/ti-sdk-6.1/ti-j7xxx
e2110b7664ba v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
ca498326386a v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
0d5061a1e57a v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
7a25611c657a v6.1/standard/cn-sdkv5.15/octeon
e9b2d66510b1 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
5fa6f43a894e v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
93b2f3943a0c v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
400c39f8498a v6.1/standard/nxp-sdk-5.15/nxp-s32g
95032458e170 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
c66df128dae9 v6.1/standard/intel-sdk-6.1/intel-socfpga
c12fc49c6f0d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
f534ba8e22e6 v6.1/standard/x86
9a3b4442f53d v6.1/standard/preempt-rt/x86
c0ee5f2b8db7 v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
65a5155b96d7 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
There are quite a few minor merge conflicts in the nxp and xilinx branches,
but they are all easy to resolve. 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 (#13201):
https://lists.yoctoproject.org/g/linux-yocto/message/13201
Mute This Topic: https://lists.yoctoproject.org/mt/102073399/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
