Messages in this thread | | | Date | Tue, 17 Oct 2023 12:12:31 +1100 | From | Stephen Rothwell <> | Subject | Re: 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] | |