Re: [patch 09/11] irda: replace __FUNCTION__ with __func__

[Andrew Morton <akpm@linux-foundation.org>]

On Wed, 30 Jul 2008 16:54:27 -0700
Harvey Harrison <harvey.harrison@gmail.com> wrote:

> On Wed, 2008-07-30 at 16:52 -0700, Andrew Morton wrote:
> > On Wed, 30 Jul 2008 16:42:36 -0700 (PDT)
> > David Miller <davem@davemloft.net> wrote:
> > 
> > > From: akpm@linux-foundation.org
> > > Date: Wed, 30 Jul 2008 12:37:42 -0700
> > > 
> > > > From: Harvey Harrison <harvey.harrison@gmail.com>
> > > > 
> > > > __FUNCTION__ is gcc-specific, use __func__
> > > > 
> > > > Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> > > > Cc: Samuel Ortiz <samuel@sortiz.org>
> > > > 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.
> 

Could.  But that would muck up Rusty's patch, or linux-next.

Then again, Rusty's full down_try() patch won't be making it into
2.6.27 and David tends to merge little cleanups like this into -rc2 (or
later) so perhaps that's the way to go.

<fixes that reject for the twelfth time>

I'll resend.