On Wed, 2008-07-30 at 16:52 -0700, Andrew Morton wrote:

On Wed, 30 Jul 2008 16:42:36 -0700 (PDT)
David Miller [off-list ref] wrote:

quoted

From: akpm@linux-foundation.org
Date: Wed, 30 Jul 2008 12:37:42 -0700

quoted

From: Harvey Harrison <redacted>

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <redacted>
Cc: Samuel Ortiz <redacted>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

This gets rejects because it conflicts with the down_try()
changes that went into Linus's tree recently.  Specifically
this occurs in sir_dev.c

urgh, OK, sorry.  I'll hang onto it, see how we get along next time.

I'll try again at -rc2 time perhaps?  Or I can just regen later tonight
and resend if you prefer.

Harvey