Hi Bruce,
This is a trial merge of the stable kernel v5.15.151 v6.1.81 for the following
branches in the linux-yocto.
ccbd1ffa2151 v5.15/standard/sdkv5.10/axxia
45a604286a8a v5.15/standard/preempt-rt/sdkv5.10/axxia
ed7ee8867f98 v5.15/standard/base
303f3510d546 v5.15/standard/preempt-rt/base
e6a8d690b275 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
cdda1db17978 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
7ad665e2ee6f v5.15/standard/cn-sdkv5.15/octeon
4d507e265800 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
60fb18180138 v5.15/standard/ti-sdk-5.10/ti-j72xx
cc8931885d08 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
992450ca5997 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
26dcbff9fd5d v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
a83c41757863 v5.15/standard/bcm-2xxx-rpi
c81d74769a8b v5.15/standard/preempt-rt/bcm-2xxx-rpi
35f83bf4a29f v5.15/standard/nxp-sdk-5.15/nxp-s32g
247fbcf91f26 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
c3685522cc88 v5.15/standard/intel-sdk-5.15/intel-socfpga
20baa09a7ecf v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
84503d026331 v5.15/standard/x86
7fb9e90bd815 v5.15/standard/preempt-rt/x86
45a39a5bbc88 v5.15/standard/sdkv5.15/xlnx-soc
88d987b19134 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
b465e20123b2 v6.1/standard/sdkv5.10/axxia
897727c08b89 v6.1/standard/preempt-rt/sdkv5.10/axxia
8cc0832f0045 v6.1/standard/base
84148641e4f7 v6.1/standard/preempt-rt/base
843d29790aa3 v6.1/standard/ti-sdk-6.1/ti-j7xxx
9c2153dd26a7 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
7db771328510 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
c874ecb3d42d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
9d281c5fc7a8 v6.1/standard/cn-sdkv5.15/octeon
246b4444977c v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
5952aa1031b1 v6.1/standard/microchip-polarfire-soc
51a32a5a3f57 v6.1/standard/preempt-rt/microchip-polarfire-soc
523d2c24f34e v6.1/standard/bcm-2xxx-rpi
b9eb9d3f6560 v6.1/standard/preempt-rt/bcm-2xxx-rpi
231cd33078f4 v6.1/standard/nxp-sdk-5.15/nxp-s32g
951687466ba3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
848e8f4c70cc v6.1/standard/intel-sdk-6.1/intel-socfpga
7f1938fe7822 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
13210ab6c69e v6.1/standard/x86
56832dd8c568 v6.1/standard/preempt-rt/x86
aaa9e44db471 v6.1/standard/sdkv6.1/xlnx-soc
e500c6b3be9f v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
- There are several minor merge conflicts on v5.15 cn96xx and nxp branches.
- Some nasty merge conflicts on the v6.1 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 (#13649):
https://lists.yoctoproject.org/g/linux-yocto/message/13649
Mute This Topic: https://lists.yoctoproject.org/mt/104783790/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
