Hi Bruce,
This is a trial merge of the stable kernel v5.15.163 v6.1.100 v6.6.41 for the
following branches in the linux-yocto.
827938d7ff39 v5.15/standard/sdkv5.10/axxia
634d12e3ad6b v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
cfa0c0489f14 v5.15/standard/base
1b4c212ab40c v5.15/standard/preempt-rt/base
#Have textual conflicts
11818358e370 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
8b7bccd476c4 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
05b150e8db99 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
2da32b2b8928 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
76e4ce4bba34 v5.15/standard/ti-sdk-5.10/ti-j72xx
8184a6eb0eb1 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
02b932d7c664 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
0b0e7fcb2740 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
80928bc921e2 v5.15/standard/bcm-2xxx-rpi
3e6b6e63ef79 v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
4ecb748e9529 v5.15/standard/nxp-sdk-5.15/nxp-s32g
2d43a96744f8 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
026c99cec92a v5.15/standard/intel-sdk-5.15/intel-socfpga
85b3580c98a4 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
04589a737af4 v5.15/standard/x86
f3a802c6c9e0 v5.15/standard/preempt-rt/x86
#Have textual conflicts
6b7ab836e2ec v5.15/standard/sdkv5.15/xlnx-soc
bd7e04069c44 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
9faf91469da0 v6.1/standard/sdkv5.10/axxia
394bf39f9c06 v6.1/standard/preempt-rt/sdkv5.10/axxia
570f8e17eaa4 v6.1/standard/base
565a29373ebf v6.1/standard/preempt-rt/base
fd6e2e6b0839 v6.1/standard/ti-sdk-6.1/ti-j7xxx
8e4bef603c81 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
f6ff652afbd0 v6.1/standard/nxp-sdk-6.1/nxp-soc
12e0c72a95de v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
2c59fc1a15d4 v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
3301c4c17f83 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
c13fa68d338e v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
adce9c8e8209 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
63e669c6f451 v6.1/standard/microchip-polarfire-soc
83d4c6f7307c v6.1/standard/preempt-rt/microchip-polarfire-soc
e4a77d2a3026 v6.1/standard/bcm-2xxx-rpi
8d997bbfec2e v6.1/standard/preempt-rt/bcm-2xxx-rpi
e924d112a386 v6.1/standard/nxp-sdk-5.15/nxp-s32g
997bc00fda3f v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
be6fd3349572 v6.1/standard/intel-sdk-6.1/intel-socfpga
c6c2a302765d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
562aa31347d1 v6.1/standard/x86
911693715834 v6.1/standard/preempt-rt/x86
0f4ee8bf25d3 v6.1/standard/sdkv6.1/xlnx-soc
729dfa7a08e2 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
cdd137df2bb2 v6.6/standard/sdkv5.15/axxia
20a201d86d2a v6.6/standard/preempt-rt/sdkv5.15/axxia
909e3bad08ae v6.6/standard/base
edf18d185acd v6.6/standard/preempt-rt/base
1b376e42e984 v6.6/standard/nxp-sdk-6.6/nxp-soc
cfa4a0283706 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
f95ccf024736 v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
058a554fa6be v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
ce03bc5dea5a v6.6/standard/nxp-sdk-6.6/nxp-s32g
d560635536dc v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
9841eabcb0eb v6.6/standard/ti-sdk-6.6/ti-soc
03e8407eb7a4 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
4ced14efa520 v6.6/standard/sdkv6.6/xlnx-soc
0c35156825a0 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
All the merge conflicts are related to octeontx2 Ethernet driver. The conflicts
with the v5.15 rt kernel are due to some unrelated changes introduced by the
following merge.
commit 82bab3e1d163
Merge: da1698718248 70388803a5a5
Author: Bruce Ashfield <bruce.ashfi...@gmail.com>
Date: Thu Apr 25 15:10:14 2024 -0400
Merge branch 'v5.15/standard/base' into v5.15/standard/preempt-rt/base
Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
# Conflicts:
# include/linux/u64_stats_sync.h
I will create a separate patch to fix this issue. 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 (#14173):
https://lists.yoctoproject.org/g/linux-yocto/message/14173
Mute This Topic: https://lists.yoctoproject.org/mt/107451389/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
