Re: linux-next: manual merge of the block tree with the asm-generic tree

[Stephen Rothwell]

Hi Ingo,

On Mon, 16 Oct 2023 13:53:13 +0200 Ingo Molnar <mingo@xxxxxxxxxx> 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

Attachment: pgpxDITeJRRG7.pgp
Description: OpenPGP digital signature