Hi Bruce,
This is a trial merge of the stable kernel v5.15.148 v6.1.75 for the following
branches in the linux-yocto.
a512a15e82c8 v5.15/standard/sdkv5.10/axxia
ce5659a6d6ff v5.15/standard/preempt-rt/sdkv5.10/axxia
a9918c33416b v5.15/standard/base
be927f5f96e8 v5.15/standard/preempt-rt/base
5622ab199b18 v5.15/standard/cn-sdkv5.4/octeon
85d04875771b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
5bf05691226a v5.15/standard/cn-sdkv5.15/octeon
557b9885b3d4 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
399f939e4c6f v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
3ea4f8500c2e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
62892325f146 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
0dbacfa4b0f7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
b1c45d93b534 v5.15/standard/bcm-2xxx-rpi
304b01b020bb v5.15/standard/preempt-rt/bcm-2xxx-rpi
ffe16d8ed8e2 v5.15/standard/nxp-sdk-5.15/nxp-s32g
56ece818f870 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
f287caa5c5c1 v5.15/standard/intel-sdk-5.15/intel-socfpga
117e2d5e5d6b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
b691813b83a3 v5.15/standard/x86
3076bd04e17b v5.15/standard/preempt-rt/x86
d9b3bb620355 v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
9c803ee65fdf v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
9f65534dcfac v6.1/standard/sdkv5.10/axxia
2e7b6e82b068 v6.1/standard/preempt-rt/sdkv5.10/axxia
08150b51121b v6.1/standard/base
3fe89e2a8a6f v6.1/standard/preempt-rt/base
58bb23e82cd2 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
befde229cbf4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
583711bfe7d9 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
975dd4c6d6f6 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
212fe11856c6 v6.1/standard/cn-sdkv5.15/octeon
b1b353f23d1e v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
c26d15400e78 v6.1/standard/microchip-polarfire-soc
54361b08907f v6.1/standard/preempt-rt/microchip-polarfire-soc
d7f07878758d v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
c0bd5f99e7fb v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
a2866d0b20c8 v6.1/standard/nxp-sdk-5.15/nxp-s32g
74744404ba57 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
fe6062df2d12 v6.1/standard/intel-sdk-6.1/intel-socfpga
6406a07b611c v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
cd5d6cbdbd58 v6.1/standard/x86
086dbebab64f v6.1/standard/preempt-rt/x86
f42ecb6ab40a v6.1/standard/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
d71cc2863355 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
There are many annoying merge conflicts scattered across different branches,
but they are not too hard to resolve. 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 (#13522):
https://lists.yoctoproject.org/g/linux-yocto/message/13522
Mute This Topic: https://lists.yoctoproject.org/mt/103972757/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
