From: Jens Axboe <axboe@kernel•dk>
To: Peter Zijlstra <peterz@infradead•org>, Arnd Bergmann <arnd@arndb•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>,
Sohil Mehta <sohil.mehta@intel•com>
Subject: Re: linux-next: manual merge of the block tree with the asm-generic tree
Date: Wed, 11 Oct 2023 10:21:06 -0600 [thread overview]
Message-ID: <66e09ad5-2dcf-4159-9c98-f37ac739a445@kernel.dk> (raw)
In-Reply-To: <b7c57f03-4606-4190-98c5-344c49656f9c@kernel.dk>
On 10/9/23 8:16 AM, Jens Axboe wrote:
> On 10/9/23 8:13 AM, Peter Zijlstra wrote:
>> 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)
>
> From my point of view, this isn't a huge problem if we do it now. The
> io_uring-futex branch is a separate branch and I have nothing on top of
> it, so I could easily just re-pull your updated branch and rebase my
> changes on top.
>
>> Or do we want to keep this fixup in the merge resolution and make sure
>> Linus is aware?
>
> If you're OK with it, I'd say let's rebase and save ourselves the
> trouble at merge time.
Peter, what's the verdict - do you want to rebase it, or leave it as-is?
--
Jens Axboe
next prev parent reply other threads:[~2023-10-11 16:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 1:31 linux-next: manual merge of the block tree with the asm-generic tree Stephen Rothwell
2023-10-09 8:48 ` Peter Zijlstra
2023-10-09 9:00 ` Arnd Bergmann
2023-10-09 14:13 ` Peter Zijlstra
2023-10-09 14:16 ` Jens Axboe
2023-10-09 14:21 ` Arnd Bergmann
2023-10-11 16:21 ` Jens Axboe [this message]
2023-10-11 17:54 ` Peter Zijlstra
2023-10-11 21:32 ` Ingo Molnar
2023-10-11 21:42 ` Jens Axboe
2023-10-11 22:01 ` Ingo Molnar
2023-10-16 11:53 ` Ingo Molnar
2023-10-17 1:12 ` Stephen Rothwell
2023-10-09 9:33 ` Stephen Rothwell
2023-10-31 22:21 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-09-25 2:05 Stephen Rothwell
2023-09-25 2:09 ` Stephen Rothwell
2023-10-31 22:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=66e09ad5-2dcf-4159-9c98-f37ac739a445@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sohil.mehta@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox