On Wed, Jan 04, 2012 at 09:18:00PM +0000, Russell King - ARM Linux wrote:

On Wed, Jan 04, 2012 at 09:52:05PM +0800, Shawn Guo wrote:

quoted

On Mon, Dec 19, 2011 at 09:13:22AM +0000, Russell King - ARM Linux wrote:

quoted

No.  It will be automatically removed from any update as long as it does
not conform to the requirements - that is, in this case, the strings
being out of sync indentified in the message to which you replied to.

Someone needs to tell me what the correct entry is supposed to look like.

Hi Russell,

Any chance to have APX4DEVKIT included in your patch 'ARM: Update
mach-types' for 3.3?

As it appears when I run the update script, the answer is yes.  I'll
update the commit in the next couple of days (I want to reduce the
number of times I re-merge the tree now that I've a git-rerere immune
conflict to deal with.)

I'll change that - as 3.2 was released last night.  I'm not going to
update mach-types now as that would be suicide - updating it will
mean a bunch of entries will be deleted, and we don't know whether that
will cause build failures.

So... not this side of the merge window.