From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753417AbbHZVal (ORCPT ); Wed, 26 Aug 2015 17:30:41 -0400 Received: from ozlabs.org ([103.22.144.67]:38189 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752224AbbHZVak (ORCPT ); Wed, 26 Aug 2015 17:30:40 -0400 Date: Thu, 27 Aug 2015 07:30:38 +1000 From: Stephen Rothwell To: Paul Mackerras Cc: Alexander Graf , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Konstantin Khlebnikov Subject: Re: linux-next: manual merge of the kvm-ppc tree with the tip tree Message-ID: <20150827073038.06f66e4b@canb.auug.org.au> In-Reply-To: <20150826182100.GA2662@fergus.ozlabs.ibm.com> References: <20150824155954.0cb8a6a8@canb.auug.org.au> <20150826182100.GA2662@fergus.ozlabs.ibm.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, On Wed, 26 Aug 2015 11:21:00 -0700 Paul Mackerras 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@canb.auug.org.au