Linus Torvalds writes:
> On Fri, Jun 5, 2020 at 12:01 PM Linus Torvalds
> wrote:
>>
>> ..and then when I actually compared whether I otherwise got the same
>> result as you, I realized that this all depends on the module tree.
>>
>> I'll go merge that first, and then re-do this all. Oh well.
>
>
Linus Torvalds writes:
> On Fri, Jun 5, 2020 at 9:38 AM Michael Ellerman wrote:
>>
>> I've pushed the result of my resolution of the conflicts to the powerpc/merge
>> branch, if you want to look at that, though I've also tried to describe it in
>> full below.
>
> I ended up doing the
On Fri, Jun 5, 2020 at 12:01 PM Linus Torvalds
wrote:
>
> ..and then when I actually compared whether I otherwise got the same
> result as you, I realized that this all depends on the module tree.
>
> I'll go merge that first, and then re-do this all. Oh well.
Ok, redone and pushed out. Can you
The pull request you sent on Sat, 06 Jun 2020 02:38:49 +1000:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
> tags/powerpc-5.8-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7ae77150d94d3b535c7b85e6b3647113095e79bf
Thank you!
--
On Fri, Jun 5, 2020 at 9:38 AM Michael Ellerman wrote:
>
> I've pushed the result of my resolution of the conflicts to the powerpc/merge
> branch, if you want to look at that, though I've also tried to describe it in
> full below.
I ended up doing the machine_check_exception() differently,
Hi Linus,
Please pull powerpc updates for 5.8.
Unfortunately we've ended up with quite a few conflicts, which is primarily my
fault for pushing things to next too late. Lesson learnt.
I've pushed the result of my resolution of the conflicts to the powerpc/merge
branch, if you want to look at
6 matches
Mail list logo
