On Fri, 31 Aug 2018, Peter Zijlstra wrote:

> On Thu, Aug 30, 2018 at 04:03:58AM -0700, tip-bot for Mukesh Ojha wrote:
> > Commit-ID:  935aad3015fb4afc0b7ef6e6c18175b95461de47
> > Gitweb:     https://git.kernel.org/tip/935aad3015fb4afc0b7ef6e6c18175b95461de47
> > Author:     Mukesh Ojha <mojha@codeaurora.org>
> > AuthorDate: Tue, 28 Aug 2018 12:24:54 +0530
> > Committer:  Thomas Gleixner <tglx@linutronix.de>
> > CommitDate: Thu, 30 Aug 2018 12:59:30 +0200
> 
> > @@ -644,12 +637,6 @@ static void cpuhp_thread_fun(unsigned int cpu)
> >  
> >  	WARN_ON_ONCE(!cpuhp_is_ap_state(state));
> >  
> > -	if (st->rollback) {
> > -		struct cpuhp_step *step = cpuhp_get_step(state);
> > -		if (step->skip_onerr)
> > -			goto next;
> > -	}
> > -
> >  	if (cpuhp_is_atomic_state(state)) {
> >  		local_irq_disable();
> >  		st->result = cpuhp_invoke_callback(cpu, state, bringup, st->node, &st->last);
> 
> 
> Can you fold this in?
> 
> ../kernel/cpu.c: In function ‘cpuhp_thread_fun’:
> ../kernel/cpu.c:663:1: warning: label ‘next’ defined but not used [-Wunused-label]

Bah. I even saw the warning and wanted to fix it before pushing it
out. That's what you get for doing 20 things at once....

Folded in and force pushed. Thanks Peter!