Hi Bruce,
This is a trial merge of the stable kernel v5.15.201 v6.1.164 v6.12.74 v6.6.127
for the following branches in the linux-yocto.
eb891553f233 20260220/v5.15/standard/sdkv5.10/axxia
cc643e5fff81 20260220/v5.15/standard/preempt-rt/sdkv5.10/axxia
3ba974361475 20260220/v5.15/standard/base
c46269216d21 20260220/v5.15/standard/preempt-rt/base
ab9b43c351af 20260220/v5.15/standard/cn-sdkv5.4/octeon
f45107173ba9 20260220/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
85062f3d01c1 20260220/v5.15/standard/cn-sdkv5.15/octeon
8f74db1fc985 20260220/v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
ce12d29e9015 20260220/v5.15/standard/cn-sdk-12.25.02-6/octeon
9fade9340a0e 20260220/v5.15/standard/preempt-rt/cn-sdk-12.25.02-6/octeon
a799d803f408 20260220/v5.15/standard/ti-sdk-5.10/ti-j72xx
367d53d2c844 20260220/v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
429a0e57a893 20260220/v5.15/standard/nxp-sdk-5.15/nxp-soc
6cd9b1bde24a 20260220/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
39182d8c8e16 20260220/v5.15/standard/nvidia-orin
#Have textual conflicts
88b7003040e1 20260220/v5.15/standard/preempt-rt/nvidia-orin
#Have textual conflicts
6f2af1b2e58e 20260220/v5.15/standard/bcm-2xxx-rpi
d1450bf91bc9 20260220/v5.15/standard/preempt-rt/bcm-2xxx-rpi
6a1a66236ab4 20260220/v5.15/standard/nxp-sdk-5.15/nxp-s32g
a78a301b5480 20260220/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
88019625dd32 20260220/v5.15/standard/nxp-sdk-5.10/nxp-s32g
7ae3307af5ec 20260220/v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
69c087fde882 20260220/v5.15/standard/intel-sdk-5.15/intel-socfpga
24bd50611f58 20260220/v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
ba27b47de18c 20260220/v5.15/standard/x86
0fa1837d4a66 20260220/v5.15/standard/preempt-rt/x86
4016360b1cd2 20260220/v5.15/standard/sdkv5.15/xlnx-soc
e8924f6e1b6b 20260220/v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
b9b514b2965e 20260220/v6.1/standard/sdkv5.10/axxia
69b0db77350f 20260220/v6.1/standard/preempt-rt/sdkv5.10/axxia
66c869b07c54 20260220/v6.1/standard/base
e4e56fe98054 20260220/v6.1/standard/preempt-rt/base
5f516b6e2ea5 20260220/v6.1/standard/ti-sdk-6.1/ti-j7xxx
1718615bee2b 20260220/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
a0f29ffc6459 20260220/v6.1/standard/ti-sdk-5.10/ti-j7xxx
6b6c62e67a01 20260220/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
9354550740d4 20260220/v6.1/standard/nxp-sdk-6.1/nxp-soc
bcfb49ecb21f 20260220/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
b96d0b816b1d 20260220/v6.1/standard/cn-sdkv5.15/octeon
6c8f5a660980 20260220/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
2ed93470bbdc 20260220/v6.1/standard/cn-sdkv6.1/octeon
9838809a8e49 20260220/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
68205e4603c7 20260220/v6.1/standard/microchip-polarfire-soc
f6f4f5d3fbfa 20260220/v6.1/standard/preempt-rt/microchip-polarfire-soc
15c30f68f5ed 20260220/v6.1/standard/bcm-2xxx-rpi
1d9af564e292 20260220/v6.1/standard/preempt-rt/bcm-2xxx-rpi
c3a412e1670d 20260220/v6.1/standard/nxp-sdk-5.15/nxp-s32g
5440835fdd38 20260220/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
83460e44f862 20260220/v6.1/standard/intel-sdk-6.1/intel-socfpga
0f5bf0fe52fb 20260220/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
f4bb9a259207 20260220/v6.1/standard/x86
0d518113d2fe 20260220/v6.1/standard/preempt-rt/x86
8eeb41d66054 20260220/v6.1/standard/sdkv6.1/xlnx-soc
59201a4db169 20260220/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
05052124075b 20260220/v6.12/standard/base
037148bd2010 20260220/v6.12/standard/preempt-rt/base
8ae5a08d3a22 20260220/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
517ec6699cb4 20260220/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
dec9e13bbf9f 20260220/v6.12/standard/nxp-sdk-6.12/nxp-soc
cac516e8eb7d 20260220/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
6ef510c6693c 20260220/v6.12/standard/octeon
b98fc9411962 20260220/v6.12/standard/preempt-rt/octeon
289990306e1a 20260220/v6.12/standard/bcm-2xxx-rpi
4e4b1cf85621 20260220/v6.12/standard/preempt-rt/bcm-2xxx-rpi
ec35f58ccec3 20260220/v6.12/standard/nxp-sdk-6.6/nxp-s32g
08087f24ff51 20260220/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
b1d081866535 20260220/v6.12/standard/intel-socfpga
275c63c27e85 20260220/v6.12/standard/preempt-rt/intel-socfpga
574081d5ba1f 20260220/v6.12/standard/ti-soc
17a61d00b2de 20260220/v6.12/standard/preempt-rt/ti-soc
26039563352f 20260220/v6.12/standard/x86
962eb98b89ab 20260220/v6.12/standard/preempt-rt/x86
1acf711940f1 20260220/v6.12/standard/xlnx-soc
00005d1ea54a 20260220/v6.12/standard/preempt-rt/xlnx-soc
644d6e27add6 20260220/v6.6/standard/sdkv5.15/axxia
e36bbc244fd8 20260220/v6.6/standard/preempt-rt/sdkv5.15/axxia
004567eceeed 20260220/v6.6/standard/base
86bb41dedf9d 20260220/v6.6/standard/preempt-rt/base
cedd0cb4e820 20260220/v6.6/standard/nxp-sdk-6.6/nxp-soc
3d395fa3a43e 20260220/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
82997928e40b 20260220/v6.6/standard/cn-sdkv6.1/octeon
263d579c32d8 20260220/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
b9c554b16b2b 20260220/v6.6/standard/cn-sdkv6.6/octeon
31fe79adf0f0 20260220/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
da3306c078aa 20260220/v6.6/standard/nvidia-orin
32b4dba2732a 20260220/v6.6/standard/preempt-rt/nvidia-orin
c90e94a80238 20260220/v6.6/standard/microchip-polarfire-soc
fb669c1a3541 20260220/v6.6/standard/preempt-rt/microchip-polarfire-soc
a565c574dc5d 20260220/v6.6/standard/bcm-2xxx-rpi
bfe826bdea19 20260220/v6.6/standard/preempt-rt/bcm-2xxx-rpi
974d96bb77a5 20260220/v6.6/standard/nxp-sdk-6.6/nxp-s32g
1109f591f2f8 20260220/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
aac5be9671ff 20260220/v6.6/standard/intel-sdk-6.6/intel-socfpga
a8dd9781349b 20260220/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
624ba16c9527 20260220/v6.6/standard/ti-sdk-6.6/ti-soc
c6ce52d6ffbc 20260220/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
bc093f6e28ae 20260220/v6.6/standard/x86
27bbd49a3a22 20260220/v6.6/standard/preempt-rt/x86
df1a246beefc 20260220/v6.6/standard/sdkv6.6/xlnx-soc
760bb5936055 20260220/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
Only a few conflicts were encountered in the v5.15 orin branches:
The configfs support for the PCI endpoint was reverted by the SDK commit:
68dc54679a68 ("Revert "PCI: endpoint: Add support in configfs to associate
two EPCs with EPF"")
As a result, the following stable commits:
fa9fb38f5fe9 ("PCI: endpoint: Avoid creating sub-groups asynchronously")
7036aff5a5e8 ("PCI: endpoint: Remove unused field in struct pci_epf_group")
8055827352b7 ("PCI: endpoint: Automatically create a function specific
attributes group")
can no longer be applied. To resolve the conflicts, simply abandon all of
them.
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 (#16325):
https://lists.yoctoproject.org/g/linux-yocto/message/16325
Mute This Topic: https://lists.yoctoproject.org/mt/117907824/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
