[PATCH][RFC] arm: Add basic support for VIA/WonderMedia SoC's

[Alexey Charkov]

2010/7/13 Russell King - ARM Linux <linux at arm.linux.org.uk>:
> On Mon, Jul 12, 2010 at 08:38:26PM -0400, Nicolas Pitre wrote:
>> I think what you did is OK.  It is best to include the whole file as
>> generated from the machine registry database when you need it.  This way
>> the merge conflict can easily be resolved by simply keeping the latest
>> version from either merged branches.
>
> Not quite - I'm now undoing some of the changes a mach-types update would
> bring because people aren't talking to me to fix stuff in the machine
> registry.  So I'm no longer just committing the updated file off the
> website.
>
> The problem is that git will automatically merge those "updates", which
> makes it much more difficult to sort out.
>

So the correct way is to submit a patch and just state that it
requires an update of mach-types containing FOO and BAR, is it?

Alexey