Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Wed, 1 Nov 2023 09:23:47 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the asm-generic
 tree
Message-ID: <20231101092347.01bc2eec@canb.auug.org.au>
In-Reply-To: <20230925120908.4b15c44d@canb.auug.org.au>
References: <20230925120544.7b1baece@canb.auug.org.au>
        <20230925120908.4b15c44d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2/u+06xgg1lGXSfxRUqMiXh";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/2/u+06xgg1lGXSfxRUqMiXh
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 25 Sep 2023 12:09:08 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> On Mon, 25 Sep 2023 12:05:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au=
> wrote:
> >
> > Today's linux-next merge of the block tree got a conflict in:
> >=20
> >   arch/ia64/kernel/syscalls/syscall.tbl
> >=20
> > between commit:
> >=20
> >   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> >=20
> > from the asm-generic tree and commits:
> >=20
> >   9f6c532f59b2 ("futex: Add sys_futex_wake()")
> >   cb8c4312afca ("futex: Add sys_futex_wait()")
> >   0f4b5f972216 ("futex: Add sys_futex_requeue()")
> >=20
> > from the block tree. =20
>=20
> These three commits are also in the tip tree.
>=20
> > I fixed it up (I just removed the file) and can carry the fix as
> > necessary.

This is now a conflict between the asm-generic tree and Linus' tree.
--=20
Cheers,
Stephen Rothwell

--Sig_/2/u+06xgg1lGXSfxRUqMiXh
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBfnMACgkQAVBC80lX
0GwLfwgAhD85pgEiS5/zT0OKuXtids3mMWGV6mBnbq/eYPsnLZC8xmqsYyBjIkV0
XMJcZRh5/BjJFNqHL7tg6Nj9FGq0+S40FPHUsXq2Ia8DlOlpkjj2Kiv7aHRfSck5
CyRu0U95g/0QRDrW4x4at59jVefmleFx6Rmi2CDA5dH2BFb6PPFWtEYBq9Zc6Vyn
7fNP7JKSteZVtPMGOcdyQEhT2XpV7MqnB9p3ZaEWa/SbYsQlCi/LSIS9Pm/H8vfS
l1ifxQ/jREvmWGTkWoTwT+xqdx9Wy03IfFo/936Mx2sEHy1qeVNZP6+mJrhbJgfz
6Ed0s5jFb+SAhW4eJiwCv3G9pgGW0A==
=gKyP
-----END PGP SIGNATURE-----

--Sig_/2/u+06xgg1lGXSfxRUqMiXh--