Re: linux-next: manual merge of the kvm-ppc tree with the tip tree

[Stephen Rothwell]

Hi Paul,

On Wed, 26 Aug 2015 11:21:00 -0700 Paul Mackerras <paulus@xxxxxxxxxx> wrote:
>
> On Mon, Aug 24, 2015 at 03:59:54PM +1000, Stephen Rothwell wrote:
> >  -		} else if (should_resched()) {
> >  +		} else if (need_resched()) {
> >  +			vc->vcore_state = VCORE_PREEMPT;
> 
> This line is removed in the kvm-ppc tree because it is now in the new
> kvmppc_vcore_preempt() function.  Thus we don't need this line in the
> merge result.  However, having it here just means that we set
> vc->vcore_state to VCORE_PREEMPT twice.

Thanks for the report.  I have fixed up my reolution.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
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/