From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>,
Peter Zijlstra <peterz@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
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: Tue, 17 Oct 2023 12:12:31 +1100 [thread overview]
Message-ID: <20231017121231.6f24c973@canb.auug.org.au> (raw)
In-Reply-To: <ZS0kKWsCaYHhKeHa@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-17 1:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 1:31 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
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 [this message]
2023-10-16 11:31 ` [tip: locking/core] alpha: Fix up new futex syscall numbers tip-bot2 for Peter Zijlstra
2023-10-09 9:33 ` linux-next: manual merge of the block tree with the asm-generic tree 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=20231017121231.6f24c973@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sohil.mehta@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®