On Mon, May 08, 2017 at 03:39:26PM +0200, Paolo Bonzini wrote: > > Ok, connected my brain and pulled now. Sorry for the inconvenience. > > I'm un-pulling this, because it creates merge conflicts with Linus's > tree due to an unwanted rebase (?) by either you or Michael. > > In particular this commit > > commit 8bf8f2e8c786f37991bd27332c75edcc524d2232 > Author: Nicholas Piggin <npiggin@xxxxxxxxx> > Date: Wed Apr 19 05:12:16 2017 +1000 > > powerpc/64s: Revert setting of LPCR[LPES] on POWER9 > > is already present in Linus's tree with a different hash: > > commit 8d1b48ef580097e111c2644e6fc6041b9784d218 > Author: Nicholas Piggin <npiggin@xxxxxxxxx> > Date: Wed Apr 19 05:12:16 2017 +1000 > > powerpc/64s: Revert setting of LPCR[LPES] on POWER9 > > and causes conflicts with this subsequent commit: > > commit 700b7eadd5625d22b8235fb21259b3d7d564c000 > Author: Nicholas Piggin <npiggin@xxxxxxxxx> > Date: Wed Apr 19 05:12:17 2017 +1000 > > powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it > > > I'll take care of sending a separate pull request to Linus, but please > avoid doing this kind of cherry-pick in the future. OK, sorry about that. The resolution is just to take the version of cpu_setup_power.S that is in Linus' tree. I think if you just send it to Linus that Linus would be able to resolve it easily. Let me know if you need me to do anything. Thanks, Paul.
