On Tue, 3 Dec 2024 12:49:54 +0100 Uwe Kleine-König wrote: > > Resolution: just take the version from upstream. > > But IMHO my variant is better than Linus's. After Linus' change the = > for .probe and .remove are aligned in the conflicting files. However the > other members initialized there are only using a single space before the > =. My change used the single space variant consistently for the whole > initializer. > > So I suggest to either drop my change, or in the conflict resolution > take my variant and not Linus's. I'll revert, it's less work.
