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

[Russell King - ARM Linux]

On Mon, Jul 12, 2010 at 08:38:26PM -0400, Nicolas Pitre wrote:
> Versatile and RealView are development boards where things like MMU-less 
> builds of Linux are tested.

That's not the reason they invented IO_ADDRESS - that exists because
I never pressed the issue early on when the Integrator port was merged,
and their use has spread and become more or less acceptable.

It's just the same as your io_p2v() macro that you used in your SA1100
port.

> 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.