Hi Bruce,
This is a trial merge of the stable kernel v6.1.107 v6.6.48 for the following
branches in the linux-yocto.
b593af8f0996 v6.1/standard/sdkv5.10/axxia
395124384a4d v6.1/standard/preempt-rt/sdkv5.10/axxia
a028dd148fb8 v6.1/standard/base
acf068ebfe10 v6.1/standard/preempt-rt/base
bb82360d8a32 v6.1/standard/ti-sdk-6.1/ti-j7xxx
9d3798489b14 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
9cbcb2312bd0 v6.1/standard/nxp-sdk-6.1/nxp-soc
87420112478b v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
433e36d8eda8 v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
49a2305dbd85 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
d47a4db0e122 v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
2f9cc7109819 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
65ca9758c1d9 v6.1/standard/microchip-polarfire-soc
726c35b0a227 v6.1/standard/preempt-rt/microchip-polarfire-soc
053a32e3ce72 v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
dcc567aca1df v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
d3d829d8093f v6.1/standard/nxp-sdk-5.15/nxp-s32g
0ea5ced4d896 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
78f43bab43e8 v6.1/standard/intel-sdk-6.1/intel-socfpga
6e27f432dcbf v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
2f0b1e8e18eb v6.1/standard/x86
838e0afff28a v6.1/standard/preempt-rt/x86
d0d90450431b v6.1/standard/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
e0e5cdee8853 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
b4382e1a81ca v6.6/standard/sdkv5.15/axxia
eed3f5f9da08 v6.6/standard/preempt-rt/sdkv5.15/axxia
b6960ad0e8fe v6.6/standard/base
c25ec6c1a200 v6.6/standard/preempt-rt/base
b1118988fbc3 v6.6/standard/nxp-sdk-6.6/nxp-soc
d1610a4c366f v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
92e3b45f635c v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
ef0e4ac10f71 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
d997e4e8cb75 v6.6/standard/microchip-polarfire-soc
678373e017d6 v6.6/standard/preempt-rt/microchip-polarfire-soc
2f7db0c9c791 v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
f0859fa5ebb8 v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
7b6217655f27 v6.6/standard/nxp-sdk-6.6/nxp-s32g
d1fc24a757d7 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
7a6179f3c941 v6.6/standard/ti-sdk-6.6/ti-soc
e5878c04ddac v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
daf695f7958f v6.6/standard/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
ead00858a126 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
- Several minor conflicts in octeon and rpi branches.
- Please note that there are some ugly and semantic conflicts in xilinx
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 (#14345):
https://lists.yoctoproject.org/g/linux-yocto/message/14345
Mute This Topic: https://lists.yoctoproject.org/mt/108178878/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
