On Wed, Feb 14, 2024 at 11:17:58PM -0500, Bruce Ashfield wrote: > My resolution scripts ended up picking up some old merge resolutions > that weren't correct for 6.1. > > I've re-done the merges by hand for the conflicting branches, but > they still don't look quite right.
No worries, all the unrelated changes brought in by the last merge have been fixed. Those fixes were sent out as separate patches and were not included in my merge this time, so it is possible that the differences you're seeing after merging v6.1.77 of stable kernel with those fixes might look quite significant compared to mine. > > When you get a chance, feel free to send fixups for those 4 conflicting > branches. I double checked these branches and only one merge resolution seems a bit problematic. I have sent out a patch [1] to fix it. [1] https://lists.yoctoproject.org/g/linux-yocto/message/13569 Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13570): https://lists.yoctoproject.org/g/linux-yocto/message/13570 Mute This Topic: https://lists.yoctoproject.org/mt/104234091/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
