On 12/11/19 22:26, Linus Torvalds wrote: >> It's not a particularly hard conflict, but I'm including anyway a >> resolution at the end of this email. > Hmm. My resolution has a slightly different conflict diff, that shows > another earlier part (that git ended up sorting out itself - maybe you > edited it out for that reason). Yes, I edited it out to point out the one that matters. Sorry for the confusion. Paolo > I think I did the right conflict resolution, but the difference in > diffs makes me just slightly nervous. Mind checking it?
