Hi Bruce,
This is a trial merge of the stable kernel v6.1.129 v6.6.79 v6.6.80 for the
following branches in the linux-yocto.
a40ebcef9a13 v6.1/standard/sdkv5.10/axxia
a9c4d8049d97 v6.1/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
234311e2abd5 v6.1/standard/base
8ff60f1cc81e v6.1/standard/preempt-rt/base
#Have textual conflicts
1e9b03a7b985 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
d6c9ee313aac v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
976de85ad166 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
fda28c32af43 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
086401bcc811 v6.1/standard/cn-sdkv5.15/octeon
e42fc6a5946c v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
7f0730b1e27b v6.1/standard/cn-sdkv6.1/octeon
4907351fe344 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
40edae5f5012 v6.1/standard/microchip-polarfire-soc
e4831153d78e v6.1/standard/preempt-rt/microchip-polarfire-soc
#Have textual conflicts
0f854a2860a1 v6.1/standard/bcm-2xxx-rpi
9a376f8cc584 v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
a5537944dc36 v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
16537c8a1050 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
e92ac0e2b8b9 v6.1/standard/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
5caef63683ec v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
e7501fd4c8e0 v6.1/standard/x86
700a501f7e3e v6.1/standard/preempt-rt/x86
#Have textual conflicts
b9999fcf8287 v6.1/standard/sdkv6.1/xlnx-soc
5f5940d20d53 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
f6aebc0d8a71 v6.6/standard/sdkv5.15/axxia
a77f920f0c6d v6.6/standard/preempt-rt/sdkv5.15/axxia
b764f4bbcbd2 v6.6/standard/base
8926038e3e85 v6.6/standard/preempt-rt/base
dac964545870 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have semantic conflicts
1238e47d5fc8 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have semantic conflicts
b2573f81abaa v6.6/standard/cn-sdkv6.1/octeon
49c66fc84dde v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
feaf40d55924 v6.6/standard/microchip-polarfire-soc
e4f387a6af49 v6.6/standard/preempt-rt/microchip-polarfire-soc
d86674f7c16f v6.6/standard/bcm-2xxx-rpi
82a8d4ddcbd5 v6.6/standard/preempt-rt/bcm-2xxx-rpi
e74410b6e003 v6.6/standard/nxp-sdk-6.6/nxp-s32g
e919cd350a52 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
4d92e50efbd7 v6.6/standard/intel-sdk-6.6/intel-socfpga
#Have textual conflicts
85c90b328c69 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
#Have textual conflicts
7f947808a0ff v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
b0c6a2621885 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
5e71acf41c6b v6.6/standard/x86
d6a0c5f5b19b v6.6/standard/preempt-rt/x86
750a1b004240 v6.6/standard/sdkv6.6/xlnx-soc
#Have textual conflicts
d52252525e5d v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
- Merge conflicts on v6.1 kernel:
- A minor conflict in the 8250 driver on the rt kernel.
- Several minor conflicts in v4l2-mc, am65 cpsw and dwc3 drivers on the
j7xxx branches.
- Several minor conflicts in mxc gpio and Rochchip cdn DP drivers on the
nxp branches.
- In addition to a higher number of conflicts, there are also some semantic
conflicts
in the PCI endpoint test driver on s32g branches. These conflicts require
closer attention.
- Merge conflicts on v6.6 kernel:
- Although there are no textual conflicts on nxp branches, there is a
semantic conflict
introduced by commit a0ee898a5024 ("nvmem: Move and rename
->fixup_cell_info()").
We need to adjust the imx-ocotp-fsb-s400 driver to align with this API
change.
- A minor conflict in the cadence-nand-controller on socfpga branches.
- A minor conflict in tidss driver on ti branches.
- The conflict in axienet driver on xilinx branches requires attention due
to differing contexts.
All branches have passed my build tests, and I have pushed them 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 (#14814):
https://lists.yoctoproject.org/g/linux-yocto/message/14814
Mute This Topic: https://lists.yoctoproject.org/mt/111431290/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
