Hi Bruce,
This is a trial merge of the stable kernel v5.15.142 v6.1.66 for the following
branches in the linux-yocto.
ec0a79dc0aef v5.15/standard/sdkv5.10/axxia
507bb438d059 v5.15/standard/preempt-rt/sdkv5.10/axxia
4669302184b9 v5.15/standard/base
783e573df9cf v5.15/standard/preempt-rt/base
49059e046428 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
7a6244bb9797 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
24cbc2965f66 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
8b28acf7e50b v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
23d9ffab17da v5.15/standard/ti-sdk-5.10/ti-j72xx
e6bf4ec20a1e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
c854197163fa v5.15/standard/nxp-sdk-5.15/nxp-soc
6aeab1358444 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
6d76f984a52a v5.15/standard/bcm-2xxx-rpi
d60364a7d619 v5.15/standard/preempt-rt/bcm-2xxx-rpi
022c1fa5580c v5.15/standard/nxp-sdk-5.15/nxp-s32g
0f195f8e1d03 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
2e5622a975e6 v5.15/standard/intel-sdk-5.15/intel-socfpga
ca0e7a071828 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
6d3a2f7a3db2 v5.15/standard/x86
69add645a500 v5.15/standard/preempt-rt/x86
ef96db253c84 v5.15/standard/sdkv5.15/xlnx-soc
adc3a6452890 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
74aa87e200fd v6.1/standard/sdkv5.10/axxia
a6f1140b687f v6.1/standard/preempt-rt/sdkv5.10/axxia
6cddc35b05c4 v6.1/standard/base
59b57d6d4d7a v6.1/standard/preempt-rt/base
3da9f0e0b52d v6.1/standard/ti-sdk-6.1/ti-j7xxx
89e8a1dccbcd v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
0c388afa7318 v6.1/standard/nxp-sdk-6.1/nxp-soc
5f84f1b325f5 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
c2ee463dead1 v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
b13e131bcbfe v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
78eb046cde76 v6.1/standard/microchip-polarfire-soc
bbd1975b4cd2 v6.1/standard/preempt-rt/microchip-polarfire-soc
3e37a141b71f v6.1/standard/bcm-2xxx-rpi
900992ed54cf v6.1/standard/preempt-rt/bcm-2xxx-rpi
4d9d858d6939 v6.1/standard/nxp-sdk-5.15/nxp-s32g
a663019f8b6e v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
6e59763061d1 v6.1/standard/intel-sdk-6.1/intel-socfpga
79d0b7b7b332 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
bcf448e6d409 v6.1/standard/x86
e5ece144d1d0 v6.1/standard/preempt-rt/x86
b8063dc2c83a v6.1/standard/sdkv6.1/xlnx-soc
ef23d34a6549 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
I encountered a build error introduced by an SDK patch during the upgrade of
stable
kernel on the v5.15/standard/cn-sdkv5.4/octeon branch. I have sent a separate
patch [1]
to address it. Besides that, I also got many nasty merge conflicts on the v6.1
octeon
branches, and I hope I have resolved them all correctly. 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.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/13416
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13417):
https://lists.yoctoproject.org/g/linux-yocto/message/13417
Mute This Topic: https://lists.yoctoproject.org/mt/103072270/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
