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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150827073038.06f66e4b@canb.auug.org.au>
Date:	Thu, 27 Aug 2015 07:30:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Mackerras <paulus@...abs.org>
Cc:	Alexander Graf <agraf@...e.de>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konstantin Khlebnikov <khlebnikov@...dex-team.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the tip tree

Hi Paul,

On Wed, 26 Aug 2015 11:21:00 -0700 Paul Mackerras <paulus@...abs.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@...b.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/