Hi Bruce,
This is a trial merge of the stable kernel v5.15.175 v6.1.121 v6.1.122 v6.6.67
v6.6.68 for the following branches in the linux-yocto.
ee5033241c5d v5.15/standard/sdkv5.10/axxia
ba7c25de0ae3 v5.15/standard/preempt-rt/sdkv5.10/axxia
541422019449 v5.15/standard/base
6f3d89ab9460 v5.15/standard/preempt-rt/base
c871d775c1b7 v5.15/standard/cn-sdkv5.4/octeon
6bb92d7c03c0 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
bcf5964dcc42 v5.15/standard/cn-sdkv5.15/octeon
86c5706d886b v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
f2a7a23a8c07 v5.15/standard/ti-sdk-5.10/ti-j72xx
4568f8b18f26 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
989f7e789482 v5.15/standard/nxp-sdk-5.15/nxp-soc
177207e27052 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
af2532a5d8b7 v5.15/standard/nvidia-orin
9f1d1c87a191 v5.15/standard/preempt-rt/nvidia-orin
c30ba354f9a5 v5.15/standard/bcm-2xxx-rpi
cc1996788a93 v5.15/standard/preempt-rt/bcm-2xxx-rpi
78544ca7f8e4 v5.15/standard/nxp-sdk-5.15/nxp-s32g
fb61b5db85c8 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
2430cb437d16 v5.15/standard/intel-sdk-5.15/intel-socfpga
b88cbb863d06 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
49e670a5cafd v5.15/standard/x86
68a0fed9729b v5.15/standard/preempt-rt/x86
f4dace25a0d6 v5.15/standard/sdkv5.15/xlnx-soc
0edd3e8e124c v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
8cf3e7304b2b v6.1/standard/sdkv5.10/axxia
b2db5fdcccd6 v6.1/standard/preempt-rt/sdkv5.10/axxia
528019d3d2da v6.1/standard/base
6685275e6c14 v6.1/standard/preempt-rt/base
58c778bba7b8 v6.1/standard/ti-sdk-6.1/ti-j7xxx
e0d516a91eba v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
d29f9cbf5f2e v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
0e43822424f3 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
dbad38927e05 v6.1/standard/cn-sdkv5.15/octeon
7cab708dbfc2 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
fbece2bcc917 v6.1/standard/cn-sdkv6.1/octeon
1494d1a8a271 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
096007790fea v6.1/standard/microchip-polarfire-soc
4acb9a7fb27c v6.1/standard/preempt-rt/microchip-polarfire-soc
aa447a127cef v6.1/standard/bcm-2xxx-rpi
0e012fb7ace4 v6.1/standard/preempt-rt/bcm-2xxx-rpi
8675fa37b1e9 v6.1/standard/nxp-sdk-5.15/nxp-s32g
3deee48ef097 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
781403c1feb4 v6.1/standard/intel-sdk-6.1/intel-socfpga
0aa021095115 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
a2b76d83ad8d v6.1/standard/x86
6cd29ae93f8f v6.1/standard/preempt-rt/x86
b160609bfe28 v6.1/standard/sdkv6.1/xlnx-soc
a935f0605add v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
07bab9ca70ce v6.6/standard/sdkv5.15/axxia
cdb88e3791cf v6.6/standard/preempt-rt/sdkv5.15/axxia
126f26d5994c v6.6/standard/base
9f49a056a63a v6.6/standard/preempt-rt/base
f51ed89f7361 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
da691d13152e v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
7b30b8a5e3c2 v6.6/standard/cn-sdkv6.1/octeon
85ed73fb13e4 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
90c378b0b14b v6.6/standard/microchip-polarfire-soc
52c541b70691 v6.6/standard/preempt-rt/microchip-polarfire-soc
b341ceb63b19 v6.6/standard/bcm-2xxx-rpi
9053810a02ea v6.6/standard/preempt-rt/bcm-2xxx-rpi
a13e1afb883e v6.6/standard/nxp-sdk-6.6/nxp-s32g
74d1baa357d1 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
57a5956b39cb v6.6/standard/intel-sdk-6.6/intel-socfpga
40606ef613bc v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
e857c52d420b v6.6/standard/ti-sdk-6.6/ti-soc
72eb2512327a v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
9b16b8897282 v6.6/standard/x86
058d7b13209f v6.6/standard/preempt-rt/x86
d554ac4f3078 v6.6/standard/sdkv6.6/xlnx-soc
70ccd8b7230a v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
There are only a few conflicts on nxp branches for the v6.1 and v6.6 kernels.
Notably, when resolving the conflict during the merge of v6.6.67, we need to
retain the change introduced by SDK commit 6ffe79c0ee75 ("net: ocelot: clean
tx_skbs when set HWTSTAMP_TX_ON").
All branches have passed my build tests, and I have pushed them 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 (#14696):
https://lists.yoctoproject.org/g/linux-yocto/message/14696
Mute This Topic: https://lists.yoctoproject.org/mt/110326849/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
