Hi Bruce,
This is a trial merge of the stable kernel v5.15.135 v6.1.56 v6.1.57 for the
following branches in the linux-yocto.
94e728b8227d v5.15/standard/sdkv5.10/axxia
cbe72a82c2b6 v5.15/standard/preempt-rt/sdkv5.10/axxia
dd2a741b1da1 v5.15/standard/base
1d5bfd18dff6 v5.15/standard/preempt-rt/base
ed66d7274d2f v5.15/standard/cn-sdkv5.4/octeon
380430de1974 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
efd865c871b6 v5.15/standard/cn-sdkv5.15/octeon
c2e5c3161115 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
c7902452c136 v5.15/standard/ti-sdk-5.10/ti-j72xx
b8d0b1286a3e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
102e65aa2400 v5.15/standard/nxp-sdk-5.15/nxp-soc
fbe06c05dc55 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
f88149d80753 v5.15/standard/bcm-2xxx-rpi
4a60feec74c4 v5.15/standard/preempt-rt/bcm-2xxx-rpi
6fa60f33f68e v5.15/standard/nxp-sdk-5.15/nxp-s32g
176ebadeb131 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
ec3ec675af1a v5.15/standard/intel-sdk-5.15/intel-socfpga
c8a68f0ceac9 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
9f5994492faf v5.15/standard/x86
dc00f0cd2163 v5.15/standard/preempt-rt/x86
1dc740987ff6 v5.15/standard/sdkv5.15/xlnx-soc
4430117f6b0a v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
7113b404110e v6.1/standard/base
72e8e7b61b00 v6.1/standard/preempt-rt/base
379864e55daf v6.1/standard/ti-sdk-6.1/ti-j7xxx
93668b9e52fa v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
fe0450f4fc71 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
ccc07edfc728 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
5f992cec7c0c v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
737f2af3caf8 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
a6394817ff92 v6.1/standard/bcm-2xxx-rpi
8df527d33703 v6.1/standard/preempt-rt/bcm-2xxx-rpi
ddf69197817f v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
e2ccb4e180e0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
ac128d006a01 v6.1/standard/intel-sdk-6.1/intel-socfpga
23e5fd534bad v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
baf62a5a6321 v6.1/standard/x86
9fab80012dc7 v6.1/standard/preempt-rt/x86
e9e8a72affae v6.1/standard/sdkv6.1/xlnx-soc
c309e650539d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There aren't any major merge conflicts. Please note I have temporarily applied a
patch [1] from Ruiqiang in order to fix the build error on v6.1 octeon rt
branch.
That patch has already been sent to linux-yocto. 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.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/13165
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13168):
https://lists.yoctoproject.org/g/linux-yocto/message/13168
Mute This Topic: https://lists.yoctoproject.org/mt/101892221/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
