On Mon, Feb 09, 2026 at 09:15:40PM -0500, Bruce Ashfield wrote: > > 2a10244861c8 20260207/v6.1/standard/cn-sdkv5.15/octeon > > #Have textual conflicts > > f36850218cb9 20260207/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > #Have textual conflicts > > 0871bdcb0e92 20260207/v6.1/standard/cn-sdkv6.1/octeon > > #Have textual conflicts > > 7f3d0aae0fde 20260207/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > > #Have textual conflicts > > My scripts showed quite a fairly large delta between the branches after > I fixed up the conflicts from your resolution. But rather than revert > something that I don't remember merging to the branches, I left the delta > (with just the conflicts resolved). Have a look at let me know if I > should have taken more changes from your branch.
Thank you for the heads-up. It appears that the file net/core/dev.c in the v6.1/standard/cn-sdkv5.15/octeon branch has been reset to the version from the v6.6/standard/preempt-rt/base branch. I will prepare and submit a patch to restore it. Aside from this issue, all other branches appear to be in good condition. Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16295): https://lists.yoctoproject.org/g/linux-yocto/message/16295 Mute This Topic: https://lists.yoctoproject.org/mt/117686681/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
