Hi Kevin (and anyone else reading this). I was out of the office Thursday and Friday last week and have picked up a bad cold for my troubles.
As such, I'm running behind on my merging. My plans are to get the pending kernel patches merged over the weekend (I don't think I'll feel well enough to do it tomorrow) Bruce On Sat, Feb 22, 2025 at 7:04 AM Kevin Hao <[email protected]> wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v6.1.129 v6.6.79 for the > following branches in the linux-yocto. > a41721d63d03 v6.1/standard/sdkv5.10/axxia > 756048a37289 v6.1/standard/preempt-rt/sdkv5.10/axxia > #Have textual conflicts > 2ed2508e2073 v6.1/standard/base > f79be018d88a v6.1/standard/preempt-rt/base > #Have textual conflicts > 367f790a5d95 v6.1/standard/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > c7ecd79f9a2a v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > 74165060292c v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 4d2c97d55d48 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 6cec032b2b98 v6.1/standard/cn-sdkv5.15/octeon > 8cec556ef059 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > 9655402bc76e v6.1/standard/cn-sdkv6.1/octeon > 8b1ff4d916aa v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > 2e71c45ff9fb v6.1/standard/microchip-polarfire-soc > c083f77c7b94 v6.1/standard/preempt-rt/microchip-polarfire-soc > #Have textual conflicts > 929cc0cb0367 v6.1/standard/bcm-2xxx-rpi > bf60e779063c v6.1/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > f1199079712a v6.1/standard/nxp-sdk-5.15/nxp-s32g > #Have textual and semantic conflicts > cbd5d6f1c972 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > #Have textual and semantic conflicts > 9ccd68f6cbe6 v6.1/standard/intel-sdk-6.1/intel-socfpga > #Have textual conflicts > e446c5a0b8fb v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > #Have textual conflicts > f9c8ac40d340 v6.1/standard/x86 > 1682f3c34444 v6.1/standard/preempt-rt/x86 > #Have textual conflicts > 607bcf0dabaf v6.1/standard/sdkv6.1/xlnx-soc > 7430d205f558 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > 0189ea6af8eb v6.6/standard/sdkv5.15/axxia > 228d92eac73a v6.6/standard/preempt-rt/sdkv5.15/axxia > d1d5c10c9062 v6.6/standard/base > 433dfcd10dda v6.6/standard/preempt-rt/base > 03d3a2944750 v6.6/standard/nxp-sdk-6.6/nxp-soc > 0811612b504a v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > 01cdcfdc8fd9 v6.6/standard/cn-sdkv6.1/octeon > b71f537177b6 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > 063c3e25c94f v6.6/standard/microchip-polarfire-soc > 6d47c07c36af v6.6/standard/preempt-rt/microchip-polarfire-soc > e8bd31efe7d1 v6.6/standard/bcm-2xxx-rpi > 2cc23a13a6ab v6.6/standard/preempt-rt/bcm-2xxx-rpi > 1867f7d92e1f v6.6/standard/nxp-sdk-6.6/nxp-s32g > 00bc507cb84c v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > d2759459309c v6.6/standard/intel-sdk-6.6/intel-socfpga > 0c37f0752b18 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > b5f46032ad42 v6.6/standard/ti-sdk-6.6/ti-soc > 4adcd2764383 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > 2f225707beea v6.6/standard/x86 > 167eca529ce2 v6.6/standard/preempt-rt/x86 > f1bd0233af47 v6.6/standard/sdkv6.6/xlnx-soc > 8136b62a11eb v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > > In this stable update cycle, we have only encountered conflicts in the > 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. > > 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 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14812): https://lists.yoctoproject.org/g/linux-yocto/message/14812 Mute This Topic: https://lists.yoctoproject.org/mt/111324171/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
