Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Wed, 1 Nov 2023 09:21:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Sohil Mehta <sohil.mehta@intel.com>
Subject: Re: linux-next: manual merge of the block tree with the asm-generic
 tree
Message-ID: <20231101092146.4a19a00b@canb.auug.org.au>
In-Reply-To: <20231009123118.4487a0e1@canb.auug.org.au>
References: <20231009123118.4487a0e1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/sxYwLbzN=Mwr0xwm9iz+GEP";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/sxYwLbzN=Mwr0xwm9iz+GEP
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 9 Oct 2023 12:31:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the block tree got conflicts in:
>=20
>   arch/alpha/kernel/syscalls/syscall.tbl
>   arch/arm/tools/syscall.tbl
>   arch/arm64/include/asm/unistd.h
>   arch/arm64/include/asm/unistd32.h
>   arch/m68k/kernel/syscalls/syscall.tbl
>   arch/microblaze/kernel/syscalls/syscall.tbl
>   arch/mips/kernel/syscalls/syscall_n32.tbl
>   arch/mips/kernel/syscalls/syscall_n64.tbl
>   arch/mips/kernel/syscalls/syscall_o32.tbl
>   arch/parisc/kernel/syscalls/syscall.tbl
>   arch/powerpc/kernel/syscalls/syscall.tbl
>   arch/s390/kernel/syscalls/syscall.tbl
>   arch/sh/kernel/syscalls/syscall.tbl
>   arch/sparc/kernel/syscalls/syscall.tbl
>   arch/x86/entry/syscalls/syscall_32.tbl
>   arch/xtensa/kernel/syscalls/syscall.tbl
>   include/uapi/asm-generic/unistd.h
>=20
> between commits:
>=20
>   2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all =
architectures")
>=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.

This is now a conflict between the asm-generic tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/sxYwLbzN=Mwr0xwm9iz+GEP
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBffoACgkQAVBC80lX
0Gx64Af9F7cnAyFeN33QuudhqVUezl/iiPmRkNuVGJS1bTjuFpG6dMaw/HT/MLP+
FpWn5ticga8cLeUGvuy70EuVGk0weR9gWqUyeUKOChtpF+dDD3seDXe/MC6qj7Du
Tml4TPI+b3oCKHZQRHi+MAjkZUJPIAWJH4WUplS9QKhA+mj7vnN9pLxT1rgZRgrO
Sx6/DRKGwq8cZYqsWhIshWN0Lw3d1UaebgmrrznOe2U3f1zhWeXruoxvMLy54gR+
/LY6brcXZgfQJONKe2OUdoIL+nJlj+jjZBfBN8ai91RfDaYpYDG1QYNAbQHqW5R6
6Tej+g+Mm7gs/SVd68QOPMTIZfm7YA==
=d2a7
-----END PGP SIGNATURE-----

--Sig_/sxYwLbzN=Mwr0xwm9iz+GEP--