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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231017121231.6f24c973@canb.auug.org.au>
Date:   Tue, 17 Oct 2023 12:12:31 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ingo Molnar <mingo@...nel.org>
Cc:     Jens Axboe <axboe@...nel.dk>,
        Peter Zijlstra <peterz@...radead.org>,
        Arnd Bergmann <arnd@...db.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        linux-next <linux-next@...r.kernel.org>,
        Sohil Mehta <sohil.mehta@...el.com>
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@...nel.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

Content of type "application/pgp-signature" skipped