From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@ozlabs•org>
Cc: Alexander Graf <agraf@suse•de>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Konstantin Khlebnikov <khlebnikov@yandex-team•ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the tip tree
Date: Thu, 27 Aug 2015 07:30:38 +1000 [thread overview]
Message-ID: <20150827073038.06f66e4b@canb.auug.org.au> (raw)
In-Reply-To: <20150826182100.GA2662@fergus.ozlabs.ibm.com>
Hi Paul,
On Wed, 26 Aug 2015 11:21:00 -0700 Paul Mackerras <paulus@ozlabs•org> 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
prev parent reply other threads:[~2015-08-26 21:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 5:59 linux-next: manual merge of the kvm-ppc tree with the tip tree Stephen Rothwell
2015-08-26 18:21 ` Paul Mackerras
2015-08-26 21:30 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150827073038.06f66e4b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agraf@suse$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=khlebnikov@yandex-team$(echo .)ru \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=paulus@ozlabs$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox