From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36BDCE95A96 for ; Mon, 9 Oct 2023 14:14:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376737AbjJIOOL (ORCPT ); Mon, 9 Oct 2023 10:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376918AbjJIOOJ (ORCPT ); Mon, 9 Oct 2023 10:14:09 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2861FC6; Mon, 9 Oct 2023 07:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RSouiM2W+vBJUxMiq+/JWhPC4djd1oYxUx1zEVW3V2U=; b=ObBm9ZDMCZTlkLOynSIed4YvST RJ27EpXsEJVf/7PyYppMrLNYBx/YmGlvCi1bS+3oW9yH6hvHV8rDeBdgoDpLZu8eMwqDu4ThIWN5j W+ZErV08wxb/u8fcyiCyrVAyC01qNe221696e+fn19ShdPJ/SWKS9kN7ewP7+RVzUy7/9/AvjKzeT sSLiXrl+oddNYjx+bsz0WblP8TXSTPedKaUjeE4Yxk4yHgq/XZnDOibwyuIBw6O5w5yDKK0GjYuMZ 5ardlLT/5GWUjSiSta9obO2cRAf6Rds6qLT2+DhT6Tkh+Banw5mQbBZeEdUa/6AaJeT3WYFj0f3OM HOtI+O3Q==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1qpr16-00GHuY-9s; Mon, 09 Oct 2023 14:13:52 +0000 Received: by noisy.programming.kicks-ass.net (Postfix, from userid 1000) id DE741300454; Mon, 9 Oct 2023 16:13:51 +0200 (CEST) Date: Mon, 9 Oct 2023 16:13:51 +0200 From: Peter Zijlstra To: Arnd Bergmann Cc: Stephen Rothwell , Jens Axboe , Linux Kernel Mailing List , linux-next , Sohil Mehta Subject: Re: linux-next: manual merge of the block tree with the asm-generic tree Message-ID: <20231009141351.GD14330@noisy.programming.kicks-ass.net> References: <20231009123118.4487a0e1@canb.auug.org.au> <20231009084812.GB14330@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Oct 09, 2023 at 11:00:19AM +0200, Arnd Bergmann wrote: > On Mon, Oct 9, 2023, at 10:48, Peter Zijlstra wrote: > > On Mon, Oct 09, 2023 at 12:31:18PM +1100, Stephen Rothwell wrote: > >> diff --cc arch/alpha/kernel/syscalls/syscall.tbl > >> index 5d05ab716a74,b1865f9bb31e..000000000000 > >> --- a/arch/alpha/kernel/syscalls/syscall.tbl > >> +++ b/arch/alpha/kernel/syscalls/syscall.tbl > >> @@@ -492,4 -492,6 +492,7 @@@ > >> 560 common set_mempolicy_home_node sys_ni_syscall > >> 561 common cachestat sys_cachestat > >> 562 common fchmodat2 sys_fchmodat2 > >> -563 common futex_wake sys_futex_wake > >> -564 common futex_wait sys_futex_wait > >> -565 common futex_requeue sys_futex_requeue > >> +563 common map_shadow_stack sys_map_shadow_stack > >> ++564 common futex_wake sys_futex_wake > >> ++565 common futex_wait sys_futex_wait > >> ++566 common futex_requeue sys_futex_requeue > > > > So this renumbers the (futex) stuff on Alpha, does anybody care? AFAICT > > Alpha does not follow the unistd order and meh. > > Let's not make it worse for now. All the numbers since the > introduction of the time64 syscalls are offset by exactly 120 > on alpha, and I'd prefer to keep it that way for the moment. > > I still hope to eventually finish the conversion of all architectures > to a single syscall.tbl for numbers >400, and if that happens before > the end of alpha, a different ordering would just be extra pain. Fair enough; should we look at rebase those futex patches for this? (bit of a pain as that would also mean rebasing block) Or do we want to keep this fixup in the merge resolution and make sure Linus is aware?