Hi Bruce,
This is a trial merge of the stable kernel v5.15.175 v6.1.121 v6.6.67 for the
following branches in the linux-yocto.
da4f1759ee5e v5.15/standard/sdkv5.10/axxia
3aca871bc430 v5.15/standard/preempt-rt/sdkv5.10/axxia
832b70ce60f1 v5.15/standard/base
1ec2a079ba2c v5.15/standard/preempt-rt/base
e3c36a9d7ab8 v5.15/standard/cn-sdkv5.4/octeon
3e285dc5ed8b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
25f45370187e v5.15/standard/cn-sdkv5.15/octeon
1e660e9abe30 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
6732cce551bd v5.15/standard/ti-sdk-5.10/ti-j72xx
9a4a3d95a0a6 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
73f1f0ec0cf8 v5.15/standard/nxp-sdk-5.15/nxp-soc
67b00598c357 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
607faf7b50fc v5.15/standard/nvidia-orin
e66dfeed43bf v5.15/standard/preempt-rt/nvidia-orin
1b815052a834 v5.15/standard/bcm-2xxx-rpi
fb15a8575779 v5.15/standard/preempt-rt/bcm-2xxx-rpi
7b3081c3049e v5.15/standard/nxp-sdk-5.15/nxp-s32g
369f0de3cae6 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
7e36f7c15003 v5.15/standard/intel-sdk-5.15/intel-socfpga
321bd4a3a898 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
e6c0890139de v5.15/standard/x86
4c9d9b0fb701 v5.15/standard/preempt-rt/x86
44756553f926 v5.15/standard/sdkv5.15/xlnx-soc
080eff81aa6f v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
7568cc7b1d86 v6.1/standard/sdkv5.10/axxia
9c79a43024c8 v6.1/standard/preempt-rt/sdkv5.10/axxia
900e0bbaa7ea v6.1/standard/base
e8fa10e8f81e v6.1/standard/preempt-rt/base
3848369416b5 v6.1/standard/ti-sdk-6.1/ti-j7xxx
cb25790e3f3d v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
eb8dac726fa7 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
e76152b98b83 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
20d168578d8c v6.1/standard/cn-sdkv5.15/octeon
a2cf425c77f5 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
f4ab20a5c7d8 v6.1/standard/cn-sdkv6.1/octeon
183ce415a2c1 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
b869e163532a v6.1/standard/microchip-polarfire-soc
62fe6d11a0db v6.1/standard/preempt-rt/microchip-polarfire-soc
5ab5df726296 v6.1/standard/bcm-2xxx-rpi
341e9a6dd188 v6.1/standard/preempt-rt/bcm-2xxx-rpi
63dbc9057b45 v6.1/standard/nxp-sdk-5.15/nxp-s32g
5d49e0efa8c0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
e0a161aed48a v6.1/standard/intel-sdk-6.1/intel-socfpga
101d7160728f v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
07538732cd1e v6.1/standard/x86
e8e79087b0f9 v6.1/standard/preempt-rt/x86
dcc19c20917f v6.1/standard/sdkv6.1/xlnx-soc
73808fa76eb6 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
5cc31f0e802b v6.6/standard/sdkv5.15/axxia
78443f624156 v6.6/standard/preempt-rt/sdkv5.15/axxia
029cf4bdb3a7 v6.6/standard/base
5a32100d6a56 v6.6/standard/preempt-rt/base
791e838e3fe9 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
0e7dd7454d9f v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
a548868617c0 v6.6/standard/cn-sdkv6.1/octeon
9f0dedc2dc3d v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
19c572b60a6f v6.6/standard/microchip-polarfire-soc
f7e02ebab397 v6.6/standard/preempt-rt/microchip-polarfire-soc
565e1bedcd2a v6.6/standard/bcm-2xxx-rpi
3bde0b888468 v6.6/standard/preempt-rt/bcm-2xxx-rpi
2e000e7f9f19 v6.6/standard/nxp-sdk-6.6/nxp-s32g
277576215e70 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
3069b197a792 v6.6/standard/intel-sdk-6.6/intel-socfpga
3463ae617dc7 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
304351785f5c v6.6/standard/ti-sdk-6.6/ti-soc
9519ce3dd235 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
a63490ad8920 v6.6/standard/x86
f6ba4d77cb48 v6.6/standard/preempt-rt/x86
b293e509252f v6.6/standard/sdkv6.6/xlnx-soc
85c919302f58 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
There is only one conflict on nxp branches for the v6.1 and v6.6 kernels.
Notably, when resolving this conflict, we need to retain the change from
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 (#14682):
https://lists.yoctoproject.org/g/linux-yocto/message/14682
Mute This Topic: https://lists.yoctoproject.org/mt/110210827/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
