lkml.org 
[lkml]   [2023]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the block tree with the asm-generic tree
Hi Ingo,

On Mon, 16 Oct 2023 13:53:13 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> Heads-up: the futex syscall numbers are now fixed on Alpha in the locking
> tree via:
>
> dcc134510eef ("alpha: Fix up new futex syscall numbers")

Thanks.

> This would, I presume, trigger a new conflict in -next, which should be
> resolved in an identical fashion.

Indeed, done.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-10-17 03:14    [W:0.057 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site