Hi Bruce,
This is a trial merge of the stable kernel v6.1.70 for the following branches
in the linux-yocto.
bd81c876a182 v6.1/standard/sdkv5.10/axxia
852fcab9cd9d v6.1/standard/preempt-rt/sdkv5.10/axxia
e1400265cf9c v6.1/standard/base
46ab880eedc0 v6.1/standard/preempt-rt/base
d74c7e9aad9e v6.1/standard/ti-sdk-6.1/ti-j7xxx
7082e4289668 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
5d78b9b4b1d8 v6.1/standard/nxp-sdk-6.1/nxp-soc
e616b4097edc v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
43b7aeca3e7e v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
8be05b73edbf v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
fad05181dd51 v6.1/standard/microchip-polarfire-soc
5810cd8ba757 v6.1/standard/preempt-rt/microchip-polarfire-soc
95974b727541 v6.1/standard/bcm-2xxx-rpi
577aba9e4592 v6.1/standard/preempt-rt/bcm-2xxx-rpi
0291479d32f8 v6.1/standard/nxp-sdk-5.15/nxp-s32g
23021b93fc17 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
c73a3eb80c49 v6.1/standard/intel-sdk-6.1/intel-socfpga
43565be6aa19 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
2cbd2f44f6e5 v6.1/standard/x86
4de728052797 v6.1/standard/preempt-rt/x86
0c1a8de00115 v6.1/standard/sdkv6.1/xlnx-soc
145723779747 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There are a few merge conflicts only in the octeon branches. While these
conflicts are not huge, they involve semantic conflicts with the SDK patches,
so we need to be more cautious. 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 (#13446):
https://lists.yoctoproject.org/g/linux-yocto/message/13446
Mute This Topic: https://lists.yoctoproject.org/mt/103476913/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
