Linus Torvalds writes:
> On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman wrote:
>>
>> Just two minor conflicts I'm aware of. The only slight subtlety is the
>> conflict
>> in kasan_init() where "int ret" needs to move out of the for_each_mem_range()
>> and up to the function scope.
>
> Well,
The pull request you sent on Fri, 16 Oct 2020 14:24:39 +1100:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
> tags/powerpc-5.10-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/96685f8666714233d34abb71b242448c80077536
Thank you!
--
On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman wrote:
>
> Just two minor conflicts I'm aware of. The only slight subtlety is the
> conflict
> in kasan_init() where "int ret" needs to move out of the for_each_mem_range()
> and up to the function scope.
Well, there was also a conflict for the
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Hi Linus,
Please pull powerpc updates for 5.10.
Just two minor conflicts I'm aware of. The only slight subtlety is the conflict
in kasan_init() where "int ret" needs to move out of the for_each_mem_range()
and up to the function scope.
Notable