Re: [PATCH 2/2] jump label: introduce static_branch()

[David Daney]

On 01/05/2011 11:14 AM, Ingo Molnar wrote:
> * H. Peter Anvin<hpa@xxxxxxxxx>  wrote:
>
> > On 01/05/2011 09:43 AM, Steven Rostedt wrote:
> > > On Wed, 2011-01-05 at 09:32 -0800, David Daney wrote:
> > >
> > > > This patch will conflict with the MIPS jump label support that Ralf has
> > > > queued up for 2.6.38.
> > >
> > > Can you disable that support for now? As Linus said at Kernel Summit,
> > > other archs jumped too quickly onto the jump label band wagon. This
> > > change really needs to get in, and IMO, it is more critical to clean up
> > > the jump label code than to have other archs implementing it.
> >
> > Ralf is really good... perhaps we can get the conflicts resolved?
>
> Yep, the best Git-ish way to handle that is to resolve the conflicts whenever they
> happen - i.e. whoever merges his tree upstream later. No need for anyone to 'wait'
> or undo anything.

There will be no git conflicts, as the affected files are disjoint.  It 
will be manifested as a build failure for MIPS, which is why I raised 
the issue.

No matter I guess.  We will undoubtedly have many -rc releases in which 
we can merge any required adjustments.

David Daney
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/