Hi Bruce,
This is a trial merge of the stable kernel v5.15.163 v6.1.100 v6.1.101 v6.6.41
v6.6.42 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
6217adb60272 v6.1/standard/sdkv5.10/axxia
deb687c894c3 v6.1/standard/preempt-rt/sdkv5.10/axxia
fac32b31bffa v6.1/standard/base
7703d9ac7b30 v6.1/standard/preempt-rt/base
4a3fccab109a v6.1/standard/ti-sdk-6.1/ti-j7xxx
b7aafcb4b0d1 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
490d693fb9a0 v6.1/standard/nxp-sdk-6.1/nxp-soc
156a1fbec602 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
60dc24d87a86 v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
12cbc7c6d654 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
8f58d6e87d4f v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
5e6812df9e83 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
b8089ade2ce8 v6.1/standard/microchip-polarfire-soc
a857f4383666 v6.1/standard/preempt-rt/microchip-polarfire-soc
f5320bae96b6 v6.1/standard/bcm-2xxx-rpi
b680811547da v6.1/standard/preempt-rt/bcm-2xxx-rpi
ac70ab65dfb5 v6.1/standard/nxp-sdk-5.15/nxp-s32g
936e13601e3c v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
4c5dc016f08d v6.1/standard/intel-sdk-6.1/intel-socfpga
850c28438e7c v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
2f58b44aea2d v6.1/standard/x86
bc16665633b2 v6.1/standard/preempt-rt/x86
aaea62056201 v6.1/standard/sdkv6.1/xlnx-soc
27cb83c411f9 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
2c59c0154671 v6.6/standard/sdkv5.15/axxia
19fedee95da1 v6.6/standard/preempt-rt/sdkv5.15/axxia
039783dce786 v6.6/standard/base
e86bc4632360 v6.6/standard/preempt-rt/base
a7fb73aaa90c v6.6/standard/nxp-sdk-6.6/nxp-soc
b0d0c15e9de3 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
4d0280a1d96d v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
9b66aae23c29 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
2a864b3ee0dc v6.6/standard/nxp-sdk-6.6/nxp-s32g
4ca6263e7881 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
cca9d54c7154 v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual and semantic conflicts
0186e96dc31c v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual and semantic conflicts
a7bcb981fcff v6.6/standard/sdkv6.6/xlnx-soc
837dc3ddcadd v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
- All the merge conflicts on octeon branches 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.
- Please note there are some semantic conflicts on the v6.6 ti branches due to
following
two commits:
stable 02c6dd05b095 ("ASoC: ti: davinci-mcasp: Set min period size using FIFO
config")
SDK 341460af1eeb ("ASoC: ti: davinci-mcasp: Set min period size using FIFO
config")
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 (#14200):
https://lists.yoctoproject.org/g/linux-yocto/message/14200
Mute This Topic: https://lists.yoctoproject.org/mt/107562484/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
