Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Mon, 25 Sep 2023 12:05:44 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Arnd Bergmann <arnd@arndb.de>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: linux-next: manual merge of the block tree with the asm-generic
 tree
Message-ID: <20230925120544.7b1baece@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vS4yXq8BsaB70Zn7TO+nQ_a";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/vS4yXq8BsaB70Zn7TO+nQ_a
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  arch/ia64/kernel/syscalls/syscall.tbl

between commit:

  cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")

from the asm-generic tree and commits:

  9f6c532f59b2 ("futex: Add sys_futex_wake()")
  cb8c4312afca ("futex: Add sys_futex_wait()")
  0f4b5f972216 ("futex: Add sys_futex_requeue()")

from the block tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/vS4yXq8BsaB70Zn7TO+nQ_a
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUQ6vgACgkQAVBC80lX
0Gzdvgf/QEeWnf4vJ6D8wEWSHt1omMGeNhKh6nl36O1k92EafU0J9UzPGBhBqwr9
0CRrgTrJZ23ghFDk2LBIDxplHPdjOaqr/ZbXit2RCzYGRKtHeNgds5UQghIdZAYm
EI1P6JUO5xL9CCdZn46RMvHLfQHuU9U8Fdrn6hOAGl8mcIIgHGNMBHd+T9iG0Qy2
S5Lb6L+wTnEEQWqfHvkW9DpHdyL96gmJzmiYomQXMO9nUvJlGtMvEqeh4FXOMc/X
j9nXYYw1zKzvloFO0miNyktXx8CZcLloYdgItSD5SF32A/A4eqXec3BVM6pfNsRP
/1RYFlfO66KMLQPLNbjEs4V5yRgGtQ==
=XddB
-----END PGP SIGNATURE-----

--Sig_/vS4yXq8BsaB70Zn7TO+nQ_a--