[Qemu-devel] Re: CODING_STYLE (was Re: [PATCHv2] qemu: target library, use it in msix)

[Paolo Bonzini <bonzini@gnu.org>]

>>> True, but with 'indent' support the pain would be brief.
>>>
>>
>> External trees (qemu-kvm, the Xen tree, distros which carry patches)
>> will all have to adapt, just so that we can reach 80 columns twice as
>> quickly.
>
> Can external trees just run indent themselves before merging upstream?

That does not help merging.  You have "git blame -w" but not "git merge -w".

You can run a huge "git merge -s ours" (or add a jumbo patch to the 
distribution), but you still have to make sure you do not introduce 
spacing differences WRT upstream, or _future_ conflicts will be even worse.

Personally I believe it is not worth it.  I think that incremental 
updates to the coding style are enough, and not too bad if we go on with 
4-space soft tabs; whipping up a version of checkpatch that supports 
4-space indent should not be hard.

Which means, you do not need to do much besides deciding how you want 
the braces.

Paolo