Paolo Bonzini <pbonzini@xxxxxxxxxx> writes:
> On 08/05/2017 09:28, Paolo Bonzini wrote:
>> On 08/05/2017 05:31, Paul Mackerras wrote:
>>> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>>>
>>>>>>> I would like this to go into 4.12. I know this pull request is
>>>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>>>> break other platforms such as POWER8.
>>>>>>
>>>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>>>> it next Tuesday because I have a public holiday.
>>>>>
>>>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>>>> or have you just not got up to it yet, or did you do it and I missed
>>>>> it?
>>>>
>>>> It was in kvm/queue only, now it's there.
>>>
>>> I'm still not seeing it. Did you forget to push it out or something?
>>
>> 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.
That was a deliberate cherry-pick, I applied it to my branch and then
later realised it should also be on the topic branch.
> 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
You mean this conflict, or was there more? Sure it's annoying, but it's
hardly the worst conflict ever. I really think Linus could have coped
with it.
diff --cc arch/powerpc/kernel/cpu_setup_power.S
index 10cb2896b2ae,1fce4ddd2e6c..000000000000
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@@ -108,7 -108,7 +108,11 @@@ _GLOBAL(__setup_cpu_power9
LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
andc r3, r3, r4
li r4,0 /* LPES = 0 */
++<<<<<<< HEAD
+ bl __init_LPCR_ISA300
++=======
+ bl __init_LPCR
++>>>>>>> fb7dcf723dd2cb1d5d8f2f49c3023130938848e3
bl __init_HFSCR
bl __init_tlb_power9
bl __init_PMU_HV
cheers
