On 8/8/20 12:44 AM, Al Viro wrote:
On Fri, Aug 07, 2020 at 10:46:13AM -0700, Linus Torvalds wrote:
On Fri, Aug 7, 2020 at 6:14 AM Michael Ellerman wrote:
Just one minor conflict, in a comment in drivers/misc/ocxl/config.c.
Well, this morning I merged the ptrace ->regset_get() updates from A
Linus Torvalds writes:
> On Fri, Aug 7, 2020 at 6:14 AM Michael Ellerman wrote:
>>
>> Just one minor conflict, in a comment in drivers/misc/ocxl/config.c.
>
> Well, this morning I merged the ptrace ->regset_get() updates from Al,
> and that brought in a different conflict.
Ah fooey.
> I _think_
On Fri, Aug 07, 2020 at 10:46:13AM -0700, Linus Torvalds wrote:
> On Fri, Aug 7, 2020 at 6:14 AM Michael Ellerman wrote:
> >
> > Just one minor conflict, in a comment in drivers/misc/ocxl/config.c.
>
> Well, this morning I merged the ptrace ->regset_get() updates from Al,
> and that brought in a
The pull request you sent on Fri, 07 Aug 2020 23:13:37 +1000:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
> tags/powerpc-5.9-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/25d8d4eecace9de5a6a2193e4df1917afbdd3052
Thank you!
--
Deet-doot-do
On Fri, Aug 7, 2020 at 6:14 AM Michael Ellerman wrote:
>
> Just one minor conflict, in a comment in drivers/misc/ocxl/config.c.
Well, this morning I merged the ptrace ->regset_get() updates from Al,
and that brought in a different conflict.
I _think_ I resolved it correctly, but while the new mo
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Hi Linus,
Please pull powerpc updates for 5.9.
Just one minor conflict, in a comment in drivers/misc/ocxl/config.c.
Notable out of area changes:
arch/m68k/include/asm/adb_iop.h # c66da95a39ec macintosh/adb-iop:
Implement SRQ autopolling
