Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Tue, 17 Oct 2023 12:12:31 +1100
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
Message-ID: <20231017121231.6f24c973@canb.auug.org.au>
In-Reply-To: <ZS0kKWsCaYHhKeHa@gmail.com>
References: <20231009123118.4487a0e1@canb.auug.org.au>
        <20231009084812.GB14330@noisy.programming.kicks-ass.net>
        <cb4bb8e2-7dfe-4ca4-aa70-060f7b2f8f95@app.fastmail.com>
        <20231009141351.GD14330@noisy.programming.kicks-ass.net>
        <b7c57f03-4606-4190-98c5-344c49656f9c@kernel.dk>
        <66e09ad5-2dcf-4159-9c98-f37ac739a445@kernel.dk>
        <20231011175407.GG6307@noisy.programming.kicks-ass.net>
        <ZScUhud9eqKIQJjC@gmail.com>
        <bf5ecd2d-06a7-4c51-a762-6fe3753044b6@kernel.dk>
        <ZScbKPQur2qao5Gf@gmail.com>
        <ZS0kKWsCaYHhKeHa@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/b3.gvt8g0i657AmabkNv=YK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--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 <mingo@kernel.org> 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--