Hi Bruce,
This is a trial merge of the stable kernel v6.1.95 v6.6.35 for the following
branches in the linux-yocto.
05be897e7591 v6.1/standard/sdkv5.10/axxia
3eac668859b8 v6.1/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
dc9370074861 v6.1/standard/base
61990e82341c v6.1/standard/preempt-rt/base
#Have textual conflicts
bfa65e529f2a v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
3ee5dac77774 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
32ad5f18acfc v6.1/standard/nxp-sdk-6.1/nxp-soc
b8484aaf6d08 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
e6095e6fb268 v6.1/standard/cn-sdkv5.15/octeon
3fe1389777a2 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
5ba1cf7937d6 v6.1/standard/cn-sdkv6.1/octeon
8c15c28f9ab0 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
c5fab1574d77 v6.1/standard/microchip-polarfire-soc
4b136d232933 v6.1/standard/preempt-rt/microchip-polarfire-soc
#Have textual conflicts
b75c12727259 v6.1/standard/bcm-2xxx-rpi
61a120a3f6d6 v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
d962e13323bc v6.1/standard/nxp-sdk-5.15/nxp-s32g
d0d1bb137185 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
24e4b3d0e8cb v6.1/standard/intel-sdk-6.1/intel-socfpga
#Have textual and semantic conflicts
7dcc10356dab v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
#Have textual and semantic conflicts
2b12835ff0ff v6.1/standard/x86
f06810f9ec00 v6.1/standard/preempt-rt/x86
#Have textual conflicts
8b39e40c5dbb v6.1/standard/sdkv6.1/xlnx-soc
00109033e3d1 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
88986c63206a v6.6/standard/sdkv5.15/axxia
13f55c7607fb v6.6/standard/preempt-rt/sdkv5.15/axxia
#Have textual conflicts
9388db4769ed v6.6/standard/base
4cd27252ceaf v6.6/standard/preempt-rt/base
#Have textual conflicts
6a166281b248 v6.6/standard/nxp-sdk-6.6/nxp-soc
4d2ae1ca08fa v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
1fdd69c33573 v6.6/standard/cn-sdkv6.1/octeon
461ba9351fcb v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
de1c4fa30ffc v6.6/standard/nxp-sdk-6.6/nxp-s32g
aebc4ebf8879 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
b142f224f854 v6.6/standard/ti-sdk-6.6/ti-soc
05889708d1bc v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
b7d992d5f925 v6.6/standard/sdkv6.6/xlnx-soc
a64c4f67e050 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
- There is a merge conflict on both v6.1 and v6.6 rt kernel, it is
straightforward to fix.
- There is a semantic conflict on v6.1 socfpga 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 (#14090):
https://lists.yoctoproject.org/g/linux-yocto/message/14090
Mute This Topic: https://lists.yoctoproject.org/mt/106827427/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
