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 79DA2CDB474 for ; Tue, 17 Oct 2023 01:12:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234344AbjJQBMs (ORCPT ); Mon, 16 Oct 2023 21:12:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234433AbjJQBMj (ORCPT ); Mon, 16 Oct 2023 21:12:39 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDCA7AB; Mon, 16 Oct 2023 18:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697505154; bh=NMhSJLLZBb5jLZS62sR9J7ik/6UGL8vr11JDWG+rlKM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DyZvcHzKj/P9BxPlXQNz4yvWSgXi9kJmHiicCTuJpMC4F9gJqG4zYyf1XhCFC7ud1 DodIjx0xes41KY6QnCSXZmRQKO897vAHemWZXWKMSaIbtXp/dQ/e+WByQgOhCh2BHz /0CyWbY5HRmh8BXkmQM9pIiQln4bgZHC4VPJcblNx5BroLmRfkkoFUAYDG1T3LcRM4 DoH2Mrfo2feKPBPuHQ5wftWh5vXpnYhO5648Q6CaSzqWQqB4b6jwre9y2C/7Bawctf /JREq63fxu1qZIDC3lwq6HguG1zAVw4zoayO9Y9c5CSZBe+9WAOJjO42ux5r0li9B9 +QmrHghV1vikw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S8bYr07llz4x1s; Tue, 17 Oct 2023 12:12:31 +1100 (AEDT) Date: Tue, 17 Oct 2023 12:12:31 +1100 From: Stephen Rothwell To: Ingo Molnar Cc: Jens Axboe , Peter Zijlstra , Arnd Bergmann , 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: <20231017121231.6f24c973@canb.auug.org.au> In-Reply-To: References: <20231009123118.4487a0e1@canb.auug.org.au> <20231009084812.GB14330@noisy.programming.kicks-ass.net> <20231009141351.GD14330@noisy.programming.kicks-ass.net> <66e09ad5-2dcf-4159-9c98-f37ac739a445@kernel.dk> <20231011175407.GG6307@noisy.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/b3.gvt8g0i657AmabkNv=YK"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/b3.gvt8g0i657AmabkNv=YK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Ingo, On Mon, 16 Oct 2023 13:53:13 +0200 Ingo Molnar wrote: > > Heads-up: the futex syscall numbers are now fixed on Alpha in the locking= =20 > tree via: >=20 > dcc134510eef ("alpha: Fix up new futex syscall numbers") Thanks. > This would, I presume, trigger a new conflict in -next, which should be=20 > resolved in an identical fashion. Indeed, done. --=20 Cheers, Stephen Rothwell --Sig_/b3.gvt8g0i657AmabkNv=YK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUt338ACgkQAVBC80lX 0Gy70Qf/R6g0nDCE9/3ItjjYeFiSaIkYUigDYYZhAo5AYmEW4/TVE0E+rpoiLvHD fXfzm2bN8pjXKTLDqWAZBi1t5qRPhxLg9zv2snD2rvFgQNhR1M750EiAAe6LSqFx gnAVAaU7CeaFE0qxZ+TKI6ZjAVNHSMBS0geYLS4AqoDPsnwVTjuFEp47Nr62LT7U uSyVvCgP2rhwgTl3cu0LFkRxUX50XvhuY/Pq2RnyNdXOhO2bCHH7w8nzdSBzxyPu WkFdkeolHygwq2X546XRu60jmERrMFFxnbdULNKMv8gwNn4UlD1UNrFSbIal2uI8 y6JQkyAhETHxNmIADYv3XxLnPMg5Tg== =LZj6 -----END PGP SIGNATURE----- --Sig_/b3.gvt8g0i657AmabkNv=YK--