Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v5.15.140 v6.1.63 v6.1.64
for the following branches in the linux-yocto.
5d89d6473be5 v5.15/standard/sdkv5.10/axxia
9e91f3d1ffe4 v5.15/standard/preempt-rt/sdkv5.10/axxia
d218f6d23295 v5.15/standard/base
dc0e13515e5b v5.15/standard/preempt-rt/base
942db4e764a4 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
7953ff539cd2 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
22b38be97ce5 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
02b8833cb7a9 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
02955c6655d0 v5.15/standard/ti-sdk-5.10/ti-j72xx
44ec48005ed8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
94b8eeaee94c v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
7fc3decca4ea v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
89db0602e71b v5.15/standard/bcm-2xxx-rpi
718ddc3bb88e v5.15/standard/preempt-rt/bcm-2xxx-rpi
4bab399e88fa v5.15/standard/nxp-sdk-5.15/nxp-s32g
9ea4878d7993 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
84357a9a688b v5.15/standard/intel-sdk-5.15/intel-socfpga
7485a561f6cc v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
c560d1dfe1a2 v5.15/standard/x86
bb8538022344 v5.15/standard/preempt-rt/x86
8545d3f79547 v5.15/standard/sdkv5.15/xlnx-soc
837b90f9a0ee v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
5adf9b6434d9 v6.1/standard/sdkv5.10/axxia
434c87daa20f v6.1/standard/preempt-rt/sdkv5.10/axxia
12fe77e25b3a v6.1/standard/base
5a078cdd6434 v6.1/standard/preempt-rt/base
b97c76a56949 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
26e8a13c963e v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
55f9bdfaaa21 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
7fe8089bc756 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
2e3722caf07b v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
a2fee3dd0d3d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
7327222c2691 v6.1/standard/microchip-polarfire-soc
cdf8a6a33721 v6.1/standard/preempt-rt/microchip-polarfire-soc
93e1c2aa3656 v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
890912890d65 v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
2847bf488cc4 v6.1/standard/nxp-sdk-5.15/nxp-s32g
a6558c9614c2 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
11912d7abd77 v6.1/standard/intel-sdk-6.1/intel-socfpga
160c2080c23a v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
e1d5afc7bf9d v6.1/standard/x86
03e7fbcbdf20 v6.1/standard/preempt-rt/x86
ad87282b996d v6.1/standard/sdkv6.1/xlnx-soc
453eb293690e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There are many nasty merge conflicts when merging v6.1.63 on the octeon
branches.
I hope I have resolved them all correctly. There are also some merge conflicts
for
other stable releases, but they are not particular difficult to handle.
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 (#13324):
https://lists.yoctoproject.org/g/linux-yocto/message/13324
Mute This Topic: https://lists.yoctoproject.org/mt/102868348/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
