Re: git-net-fixup.patch added to -mm tree

[Andrew Morton <akpm@osdl.org>]

"David S. Miller" <davem@davemloft.net> wrote:
>
> From: akpm@osdl.org
> Date: Sun, 31 Jul 2005 22:03:47 -0700
> 
> > From: Andrew Morton <akpm@osdl.org>
> > 
> > Signed-off-by: Andrew Morton <akpm@osdl.org>
>  ...
> >  /* decrement reference count on a conntrack */
> > -extern void ip_conntrack_put(struct ip_conntrack *ct);
> > +static inline void
> > +ip_conntrack_put(struct ip_conntrack *ct)
> > +{
> > +	IP_NF_ASSERT(ct);
> > +	nf_conntrack_put(&ct->ct_general);
> > +}
> 
> You can instead just kill the EXPORT_SYMBOL_GPL() in
> ip_conntrack_standalone.c as that's the only reference outside of
> ip_conntrack_core.c
> 
> Harald?

Actually, that patch is just a fixup for a patch reject from the net-2.6.14
diff.  I do that sometimes when I get sick of fixing up the same reject
each time I pull the various trees.

(I'm not sure _why_ I'm getting a reject applying that diff.  Nothing else
touches that file.  git is not quite yet generating the linus->davem diff
which I want..)