> I had differences in my v6.6/standard/nxp-sdk-6.6/nxp-soc branch > vs yours. One is explained by a patch I merged last night, the > other, I'm not sure. Since if I take the delta between the two > branches I'd be undoing upstream commit:
Yes, we need to partially revert the upstream changes because an SDK commit has already addressed the same issue. > > commit d038693e08adf9c162c6377800495e4f5a2df045 > Author: Alexander Stein <[email protected]> > Date: Thu Nov 21 11:27:51 2024 +0800 > > i2c: lpi2c: Avoid calling clk_get_rate during transfer > > So I kept my delta in the branch. Send an update if I didn't see > where it was on purpose (your merge commit didn't show a conflict > in the file that is different between the branches) The patch is coming. > I caught a runaway merge (a git gc started and a missed return code > caused some file to not get committed). I stopped it before the files > were committed to the wrong branch, but this may explain when that > symptom was detected a few months ago. Yes, this seems to be the reason for the problem. > > Double check if I in fact didn't stop it in time and send fixes as > necessary. I've checked everything, and it all looks good. Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14658): https://lists.yoctoproject.org/g/linux-yocto/message/14658 Mute This Topic: https://lists.yoctoproject.org/mt/110021992/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
