Hi Bruce,
This is a trial merge of the stable kernel v5.15.137 v6.1.60 for the following
branches in the linux-yocto.
383dab73512e v5.15/standard/sdkv5.10/axxia
23e4a8c135f0 v5.15/standard/preempt-rt/sdkv5.10/axxia
cfda2504c69b v5.15/standard/base
52265f08381b v5.15/standard/preempt-rt/base
f4cfca7f4b1c v5.15/standard/cn-sdkv5.4/octeon
e015b8e43765 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
f43a3b485cf9 v5.15/standard/cn-sdkv5.15/octeon
59608b1808b3 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
27579b69fe57 v5.15/standard/ti-sdk-5.10/ti-j72xx
d0c90916d057 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
1435660b41d1 v5.15/standard/nxp-sdk-5.15/nxp-soc
5ff80c15e0b3 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
a3068fff99ed v5.15/standard/bcm-2xxx-rpi
3768defc79ac v5.15/standard/preempt-rt/bcm-2xxx-rpi
c339835db3a7 v5.15/standard/nxp-sdk-5.15/nxp-s32g
2541f0ddf53b v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
e874d7b0faf7 v5.15/standard/intel-sdk-5.15/intel-socfpga
b191a43dab28 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
f89b7978ad1b v5.15/standard/x86
06504159996b v5.15/standard/preempt-rt/x86
ef0d4010214c v5.15/standard/sdkv5.15/xlnx-soc
9f646e1c63a4 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
ec7188288618 v6.1/standard/base
589f38467c0a v6.1/standard/preempt-rt/base
8bef9cab9146 v6.1/standard/ti-sdk-6.1/ti-j7xxx
dfc4b04152a2 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
b764fb17eb24 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
80a3af35dd54 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
fc1dc00cb450 v6.1/standard/cn-sdkv5.15/octeon
fbfd64f21033 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
525c2f4b1c7c v6.1/standard/bcm-2xxx-rpi
f3a8638cb81c v6.1/standard/preempt-rt/bcm-2xxx-rpi
85dc66e1237c v6.1/standard/nxp-sdk-5.15/nxp-s32g
3e625c781e4f v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
05aafa191a44 v6.1/standard/intel-sdk-6.1/intel-socfpga
16c7bdd94611 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
302b0981793c v6.1/standard/x86
82ece16342f8 v6.1/standard/preempt-rt/x86
486f834c3803 v6.1/standard/sdkv6.1/xlnx-soc
51441240f9ab v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
Just a trivial merge conflict in v6.1 nxp branch. 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 (#13234):
https://lists.yoctoproject.org/g/linux-yocto/message/13234
Mute This Topic: https://lists.yoctoproject.org/mt/102191157/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
